From 621772dbb8dcc569e8a8c7712b9eba9b011b4605 Mon Sep 17 00:00:00 2001 From: Micah Acinapura Date: Mon, 22 Jun 2020 11:58:38 -0400 Subject: [PATCH] starting up webgui even if now window with guitag available --- modules/cefwebgui/cefwebguimodule.cpp | 6 ++++-- modules/webbrowser/webbrowsermodule.cpp | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp index c5421391e0..4af5fe7ed1 100644 --- a/modules/cefwebgui/cefwebguimodule.cpp +++ b/modules/cefwebgui/cefwebguimodule.cpp @@ -91,11 +91,13 @@ void CefWebGuiModule::startOrStopGui() { WebBrowserModule* webBrowserModule = global::moduleEngine.module(); - const bool isGuiWindow = global::windowDelegate.hasGuiWindow(); + //TODO: micah - revisit this, either remove code or find situation + //where you haave a master without a gui and fixfor it. + //const bool hasGuiWindow = global::windowDelegate.hasGuiWindow(); const bool isMaster = global::windowDelegate.isMaster(); - if (_enabled && isGuiWindow && isMaster) { + if (_enabled && isMaster) { LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _url)); if (!_instance) { diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp index f7ef7eca8e..877d1f8e0c 100644 --- a/modules/webbrowser/webbrowsermodule.cpp +++ b/modules/webbrowser/webbrowsermodule.cpp @@ -138,10 +138,13 @@ void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) { _enabled = dictionary.value("Enabled"); } - const bool isGuiWindow = global::windowDelegate.hasGuiWindow(); + //TODO: micah - revisit this, either remove code or find situation + //where you haave a master without a gui and fixfor it. + //const bool haGuiWindow = global::windowDelegate.hasGuiWindow(); + const bool isMaster = global::windowDelegate.isMaster(); - if (!_enabled || !isGuiWindow || !isMaster) { + if (!_enabled || (!isMaster) ) { return; }