If using the mouse wheel to change pts, don't use it to scroll.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 559894271e8b9ed808ddb7ac7efcc06e34d405f5..a483dc17a4b1d1ca86370bcfd3b90372e1127c79 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2,6 +2,7 @@
 
 #include "clip_list.h"
 #include "disk_space_estimator.h"
+#include "flags.h"
 #include "player.h"
 #include "post_to_main_thread.h"
 #include "timebase.h"
@@ -29,7 +30,7 @@ extern vector<int64_t> frames[MAX_STREAMS];
 
 MainWindow::MainWindow()
        : ui(new Ui::MainWindow),
-         db("futatabi.db")
+         db(global_flags.working_directory + "/futatabi.db")
 {
        global_mainwindow = this;
        ui->setupUi(this);
@@ -593,6 +594,7 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
                        }
                }
                currently_deferring_model_changes = false;
+               return true;  // Don't scroll.
        } else if (event->type() == QEvent::MouseButtonRelease) {
                scrubbing = false;
        }