MainWindow: Prevent Qt from restoring the dock widgets

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 59f4369e2990ca902d15d1a0c3dc5fbcaea9b560..33870145232afdd654a750cac5046169d7051201 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -812,6 +812,17 @@ QMenu* MainWindow::createPopupMenu()
        return nullptr;
 }
 
+bool MainWindow::restoreState(const QByteArray &state, int version)
+{
+       (void)state;
+       (void)version;
+
+       // Do nothing. We don't want Qt to handle this, or else it
+       // will try to restore all the dock widgets and create havoc.
+
+       return false;
+}
+
 void MainWindow::show_session_error(
        const QString text, const QString info_text)
 {

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 9a66b3452dc00292151d7c054b6be5627af6cc6c..618a10e0fb51b1097a2e3b91216dd0c46a5778ad 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -150,6 +150,8 @@ private:
 
        virtual QMenu* createPopupMenu();
 
+       virtual bool restoreState(const QByteArray &state, int version = 0);
+
 private Q_SLOTS:
        void show_session_error(
                const QString text, const QString info_text);