mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 04:49:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

starting up webgui even if now window with guitag available

Browse Source
This commit is contained in:
Micah Acinapura
2020-06-22 11:58:38 -04:00
parent 386e7d9312
commit 621772dbb8
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/cefwebgui/cefwebguimodule.cpp
View File

@@ -91,11 +91,13 @@ void CefWebGuiModule::startOrStopGui() {
WebBrowserModule* webBrowserModule = global::moduleEngine.module<WebBrowserModule>();
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) {

7
modules/webbrowser/webbrowsermodule.cpp
View File

@@ -138,10 +138,13 @@ void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) {
_enabled = dictionary.value<bool>("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;
}