Some minor cleaning up.

opencor · Apr 18, 2018 · ae667ff · ae667ff
2 parents 9dde3e7 + 022d71c
commit ae667ff
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/plugins/dataStore/CSVDataStore/src/csvdatastoreexporter.cpp b/src/plugins/dataStore/CSVDataStore/src/csvdatastoreexporter.cpp
@@ -180,7 +180,8 @@ void CsvDataStoreExporter::execute(QString &pErrorMessage) const
                         else
                             rowData += ',';
 
-                        if (dataStore->voi()->value(runsIndex[j], j) == voiValue) {
+                        if (   (runsIndex[j] < dataStore->size(j))
+                            && (dataStore->voi()->value(runsIndex[j], j) == voiValue)) {
                             rowData += QString::number(variableRun->value(runsIndex[j], j));
 
                             updateRunsIndex[j] = true;

diff --git a/src/plugins/miscellaneous/Core/src/commonwidget.cpp b/src/plugins/miscellaneous/Core/src/commonwidget.cpp
@@ -202,11 +202,14 @@ void CommonWidget::setBusyWidgetProgress(double pProgress)
 
 void CommonWidget::processEvents()
 {
-    // Process events, but only if our parent is visible, and we or our central
-    // widget is not showing our or its busy widget
+    // Process events, but only if our parent is visible and updates are enabled
+    // for it, and we or our central widget is not showing our or its busy
+    // widget
 
-    if (mParent->isVisible() && !mBusyWidget && !centralWidget()->isBusyWidgetVisible())
+    if (    mParent->isVisible() && mParent->updatesEnabled()
+        && !mBusyWidget && !centralWidget()->isBusyWidgetVisible()) {
         QCoreApplication::processEvents();
+    }
 }
 
 //==============================================================================

diff --git a/src/plugins/miscellaneous/Core/src/propertyeditorwidget.cpp b/src/plugins/miscellaneous/Core/src/propertyeditorwidget.cpp
@@ -1122,7 +1122,7 @@ void Property::setColorValue(const QPoint &pPoint)
         //       time round, we will have to click anywhere in OpenCOR for
         //       OpenCOR to get the focus back...
 
-        QCoreApplication::processEvents();
+        mOwner->processEvents();
     }
 }
 

diff --git a/src/plugins/organisation/FileBrowserWindow/src/filebrowserwindowwidget.cpp b/src/plugins/organisation/FileBrowserWindow/src/filebrowserwindowwidget.cpp
@@ -194,7 +194,7 @@ void FileBrowserWindowWidget::loadSettings(QSettings *pSettings)
     // Note: indeed, to process pending events only in directoryLoaded() is not
     //       good enough (anymore?!) on macOS...
 
-    QCoreApplication::processEvents();
+    processEvents();
 
     // Let the user know of a few default things about ourselves by emitting a
     // few signals
@@ -535,7 +535,7 @@ void FileBrowserWindowWidget::directoryLoaded(const QString &pPath)
         // Windows doesn't need this, Linux and macOS definitely do and it can't
         // harm having it for all three environments)
 
-        QCoreApplication::processEvents();
+        processEvents();
 
         QModelIndex initPathDirIndex = mModel->index(mInitPathDir);