X-Git-Url: http://git.maemo.org/git/?p=qtrapids;a=blobdiff_plain;f=src%2Fserver%2FTorrentSession.cpp;h=d9d2b95990eb55e52b650f9a8a8eb5fc87082184;hp=b877470236d24f1f42d660b796e8fc22117921d3;hb=1d97c0a567b80cf9fc67791669debfe3aa9c4c84;hpb=b13664d07d62f8b78c3a2a0d2f879b67262be8b4 diff --git a/src/server/TorrentSession.cpp b/src/server/TorrentSession.cpp index b877470..d9d2b95 100644 --- a/src/server/TorrentSession.cpp +++ b/src/server/TorrentSession.cpp @@ -1,3 +1,20 @@ +/*************************************************************************** + * Copyright (C) 2010 by Ixonos Plc * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; version 2 of the License. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ #include "TorrentSession.hpp" #include "TorrentHandle.hpp" #include "AlertWaiterThread.hpp" @@ -38,6 +55,15 @@ TorrentSession::TorrentSession(QObject *parent, QSettings *settings) } + +TorrentSession::~TorrentSession() +{ + alertWaiter_->stop(); + alertWaiter_->wait(); + emit sessionTerminated(); +} + + void TorrentSession::loadState() { TorrentDownloadInfo info; @@ -251,6 +277,7 @@ qtrapids::ParamsMap_t TorrentSession::getOptions() void TorrentSession::terminateSession() { qDebug() << "Terminate called"; + // Emiting terminate() here causes the server application to quit in main() emit terminate(); }