[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/sysadmin/muon
From:       Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date:       2010-12-28 15:05:13
Message-ID: 20101228150513.35CD8AC8AD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1209922 by jmthomas:

Don't quit if an InitError comes from the worker. If the timing is right a LockError \
can be reported as an InitError in the worker, and we don't have to quit all of Muon \
over that


 M  +5 -3      libmuon/MuonMainWindow.cpp  
 M  +2 -0      muon/MainWindow.cpp  


--- trunk/extragear/sysadmin/muon/libmuon/MuonMainWindow.cpp #1209921:1209922
@@ -207,8 +207,11 @@
                      "configuration may be broken.");
         title = i18nc("@title:window", "Initialization error");
         QString details = args["ErrorText"].toString();
+        bool fromWorker = args["FromWorker"].toBool();
         KMessageBox::detailedError(this, text, details, title);
+        if (!fromWorker) {
         KApplication::instance()->quit();
+        }
         break;
     }
     case QApt::LockError:
@@ -270,15 +273,14 @@
         break;
     }
     case QApt::UserCancelError:
-        m_canExit = true;
         break;
     case QApt::UnknownError:
     default:
-        break;
-    }
     setActionsEnabled();
     m_canExit = true; // If we were committing changes, we aren't anymore
+        break;
 }
+}
 
 void MuonMainWindow::warningOccurred(QApt::WarningCode warning, const QVariantMap \
&args)  {
--- trunk/extragear/sysadmin/muon/muon/MainWindow.cpp #1209921:1209922
@@ -256,6 +256,8 @@
 {
     Q_UNUSED(details);
 
+    MuonMainWindow::errorOccurred(error, details);
+
     switch(error) {
     case QApt::UserCancelError:
         returnFromPreview();


[prev in list] [next in list] [prev in thread] [next in thread]