X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=33870145232afdd654a750cac5046169d7051201;hb=55547a4510d8ff310ab1ac57e69e3e51132b2c2f;hp=8ab1a24b70b0f8ccf8c073231640880e93e3e28a;hpb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 8ab1a24..3387014 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -807,6 +807,22 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
 	QMainWindow::keyReleaseEvent(event);
 }
 
+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)
 {