From: <ibr...@us...> - 2010-08-31 20:31:32
|
Revision: 3678 http://tora.svn.sourceforge.net/tora/?rev=3678&view=rev Author: ibre5041 Date: 2010-08-31 20:31:26 +0000 (Tue, 31 Aug 2010) Log Message: ----------- fix for bug #3047401, by zeroj Modified Paths: -------------- branches/tora-trotl/src/tonewconnection.cpp branches/tora-trotl/src/tonewconnection.h Modified: branches/tora-trotl/src/tonewconnection.cpp =================================================================== --- branches/tora-trotl/src/tonewconnection.cpp 2010-08-31 20:09:57 UTC (rev 3677) +++ branches/tora-trotl/src/tonewconnection.cpp 2010-08-31 20:31:26 UTC (rev 3678) @@ -337,18 +337,19 @@ void toNewConnection::done(int r) { - writeSettings(); - if (!r) { + writeSettings(false); QDialog::done(r); return; } - NewConnection = makeConnection(true); + NewConnection = makeConnection(); if (!NewConnection) return; + writeSettings(true); + QDialog::done(r); } @@ -522,7 +523,7 @@ void toNewConnection::testConnectionButton_clicked() { - toConnection * c = makeConnection(false); + toConnection * c = makeConnection(); if (c) { QMessageBox::information(this->parentWidget(), @@ -533,7 +534,7 @@ } } -toConnection* toNewConnection::makeConnection(bool savePrefs) +toConnection* toNewConnection::makeConnection() { try { @@ -616,9 +617,6 @@ colorComboBox->itemData(colorComboBox->currentIndex()).toString(), options); - if (savePrefs) - writeSettings(true); - return retCon; } catch (const QString &exc) Modified: branches/tora-trotl/src/tonewconnection.h =================================================================== --- branches/tora-trotl/src/tonewconnection.h 2010-08-31 20:09:57 UTC (rev 3677) +++ branches/tora-trotl/src/tonewconnection.h 2010-08-31 20:31:26 UTC (rev 3678) @@ -156,7 +156,7 @@ // fills form with data from previous connection at param row void loadPrevious(const QModelIndex & current); - toConnection* makeConnection(bool savePrefs); + toConnection* makeConnection(); public slots: virtual void done(int r); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |