mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-23 20:49:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge with latest master

Browse Source
This commit is contained in:
GPayne
2020-02-19 09:25:33 -07:00
parent 79a3b42d06
commit addfa65fa6
230 changed files with 1151 additions and 2270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/cefwebgui/cefwebguimodule.cpp
View File

@@ -121,7 +121,8 @@ void CefWebGuiModule::startOrStopGui() {
_instance->setZoom(_guiScale);
webBrowserModule->addBrowser(_instance.get());
} else if (_instance) {
}
else if (_instance) {
_instance->close(true);
webBrowserModule->removeBrowser(_instance.get());
webBrowserModule->detachEventHandler();
@@ -176,7 +177,8 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
if (_visible && _instance) {
webBrowserModule->attachEventHandler(_instance.get());
} else {
}
else {
webBrowserModule->detachEventHandler();
}
});