Merge pull request #139 from erasmux/better_diagnostics_and_shortcuts_fix

Better diagnostics and shortcuts fix

1 files changed, 5 insertions, 19 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 48dfdfbd..1db895fc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1465,17 +1465,18 @@ void MainWindow::storeSettings(QSettings &settings) {
   }

 }

 

-void MainWindow::lock()

+ILockedWaitingForProcess* MainWindow::lock()

 {

   if (m_LockDialog != nullptr) {

     ++m_LockCount;

-    return;

+    return m_LockDialog;

   }

   m_LockDialog = new LockedDialog(qApp->activeWindow());

   m_LockDialog->show();

   setEnabled(false);

   m_LockDialog->setEnabled(true); //What's the point otherwise?

   ++m_LockCount;

+  return m_LockDialog;

 }

 

 void MainWindow::unlock()

@@ -1494,22 +1495,6 @@ void MainWindow::unlock()
   }

 }

 

-bool MainWindow::unlockClicked()

-{

-  if (m_LockDialog != nullptr) {

-    return m_LockDialog->unlockClicked();

-  } else {

-    return false;

-  }

-}

-

-void MainWindow::setProcessName(QString const &name)

-{

-  if (m_LockDialog != nullptr) {

-    m_LockDialog->setProcessName(name);

-  }

-}

-

 void MainWindow::on_btnRefreshData_clicked()

 {

   m_OrganizerCore.refreshDirectoryStructure();

@@ -3296,7 +3281,8 @@ void MainWindow::on_actionSettings_triggered()
 

   updateDownloadListDelegate();

 

-  m_OrganizerCore.setLogLevel(settings.logLevel());

+  m_OrganizerCore.updateVFSParams(settings.logLevel(), settings.crashDumpsType());

+  m_OrganizerCore.cycleDiagnostics();

 }