summaryrefslogtreecommitdiffstats
path: root/src/dialog.cpp
diff options
context:
space:
mode:
authorSimon Rettberg2019-07-02 15:55:51 +0200
committerSimon Rettberg2019-07-02 15:55:51 +0200
commitd6651f307d896848372ac696e8335ac47eac8888 (patch)
tree8dc41bd8b108026620b6a40786dac919bb685c63 /src/dialog.cpp
parentDon't bail out if default config doesn't exist (diff)
downloadvmchooser2-d6651f307d896848372ac696e8335ac47eac8888.tar.gz
vmchooser2-d6651f307d896848372ac696e8335ac47eac8888.tar.xz
vmchooser2-d6651f307d896848372ac696e8335ac47eac8888.zip
Temporarily spawn openbox if no WM is running
Diffstat (limited to 'src/dialog.cpp')
-rw-r--r--src/dialog.cpp6
1 files changed, 6 insertions, 0 deletions
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