Merge pull request #100 from SCCapstone/scrollCrashFix

Trying Mutex Lock to fix scroll crash
SCCapstone · Apr 26, 2021 · 80c09df · 80c09df
2 parents fb18045 + 7a00077
commit 80c09df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Roto/mainwindow.cpp b/Roto/mainwindow.cpp
@@ -261,6 +261,7 @@ void MainWindow::mouseDoubleClickEvent(QMouseEvent *event) {
 }
 
 void MainWindow::wheelEvent(QWheelEvent *event) {
+    scrollLock.lock();
     if (ioh->getWorkingLayer() == nullptr)
         return;
     int dy = event->angleDelta().y();
@@ -305,6 +306,7 @@ void MainWindow::wheelEvent(QWheelEvent *event) {
     }
     else if (mode == Raster_Mode)
         ioh->getWorkingLayer()->spinWheel(dy);
+    scrollLock.unlock();
     refresh();
 }
 

diff --git a/Roto/mainwindow.h b/Roto/mainwindow.h
@@ -93,6 +93,7 @@ const QString Kernal_Loc = "/Kernals/";
 const QString FetchLink = "https://github.com/SCCapstone/SnakyBusiness/raw/master";
 const vector <string> acceptedImportImageFormats = {"bmp", "jpg", "jpeg", "png", "ppm", "xbm", "xpm", "gif", "pbm", "pgm"};
 const vector <string> acceptedExportImageFormats = {"bmp", "jpg", "jpeg", "png", "ppm", "xbm", "xpm"};
+static mutex scrollLock;
 
 enum downloadAction {DownloadThenRestart, DownLoadThenOpen};
 
@@ -177,6 +178,7 @@ public slots:
     QProgressDialog *progress;
     brushShape *brushProlfiler;
     patternProfiler *pp;
+    bool lock;
     QLabel *histograms;
 };