From d6651f307d896848372ac696e8335ac47eac8888 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 2 Jul 2019 15:55:51 +0200
Subject: Temporarily spawn openbox if no WM is running

---
 src/dialog.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/dialog.cpp')

diff --git a/src/dialog.cpp b/src/dialog.cpp
index a23e3ce..932f28c 100644
--- a/src/dialog.cpp
+++ b/src/dialog.cpp
@@ -22,11 +22,16 @@
 #include "vsession.h"
 #include "userconfig.h"
 #include "filedownloader.h"
+#include "windowmanager.h"
 
 static bool isProcessRunning(const QString &binary);
 
 Dialog::Dialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::Dialog) {
+
+    // Make sure a window manager is running, so any modals or other popups work properly
+    WindowManager::ensureRunning();
+
     model_[TAB_NATIVE] = new SessionTreeModel(parent);
     model_[TAB_RECENT_COURSES] = new SessionTreeModel(parent, true);
     model_[TAB_ALL_VMS] = new SessionTreeModel(parent);
@@ -153,6 +158,7 @@ void Dialog::on_treeView_doubleClicked(const QModelIndex& index)
 
     // Run session
     if (s->run()) {
+        WindowManager::stopOwnInstance();
         // Run session start script if the session could be initialized successfully
         if (QFile::exists(SESSION_START_SCRIPT)) {
             // Use the current environment variables and add the necessary
-- 
cgit v1.2.3-55-g7522