linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2440
committer: cologic <ne5@xxxxxxxxxxx>
branch nick: dcplusplus
timestamp: Fri 2011-02-25 06:49:51 -0500
message:
  IDCANCEL means IDNO (WINE fix, since it sometimes lets one cancel dialogs that aren't supposed to be cancellable)
modified:
  win32/HubFrame.cpp
  win32/UploadPage.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'win32/HubFrame.cpp'
--- win32/HubFrame.cpp	2011-02-19 17:03:15 +0000
+++ win32/HubFrame.cpp	2011-02-25 11:49:51 +0000
@@ -239,7 +239,7 @@
 
 bool HubFrame::preClosing() {
 	if(BOOLSETTING(CONFIRM_HUB_CLOSING) && !WinUtil::mainWindow->closing() &&
-		dwt::MessageBox(this).show(getText() + _T("\n\n") + T_("Really close?"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), dwt::MessageBox::BOX_YESNO, dwt::MessageBox::BOX_ICONQUESTION) == IDNO)
+		dwt::MessageBox(this).show(getText() + _T("\n\n") + T_("Really close?"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), dwt::MessageBox::BOX_YESNO, dwt::MessageBox::BOX_ICONQUESTION) != IDYES)
 		return false;
 
 	FavoriteManager::getInstance()->removeListener(this);

=== modified file 'win32/UploadPage.cpp'
--- win32/UploadPage.cpp	2011-02-19 17:03:15 +0000
+++ win32/UploadPage.cpp	2011-02-25 11:49:51 +0000
@@ -289,7 +289,7 @@
 				const string aLine = Text::fromT(line);
 				if(sm->hasVirtual(sm->validateVirtual(aLine))) {
 					if(dwt::MessageBox(this).show(str(TF_("A virtual directory named %1% already exists, do you wish to merge the contents?") % line),
-						_T(APPNAME) _T(" ") _T(VERSIONSTRING), dwt::MessageBox::BOX_YESNO, dwt::MessageBox::BOX_ICONQUESTION) == IDNO) {
+						_T(APPNAME) _T(" ") _T(VERSIONSTRING), dwt::MessageBox::BOX_YESNO, dwt::MessageBox::BOX_ICONQUESTION) != IDYES) {
 						continue;
 					}
 				}