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

Various small fixes

Browse Source
This commit is contained in:
Alexander Bock
2018-11-06 15:04:19 -05:00
parent 7c0268e87c
commit f8c27629f5
23 changed files with 174 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/webbrowser/src/browserinstance.cpp
+3 -6
View File
@@ -27,13 +27,13 @@
#include <modules/webbrowser/include/browserclient.h>
#include <modules/webbrowser/include/webrenderhandler.h>
#include <modules/webbrowser/include/webkeyboardhandler.h>
#include <openspace/engine/windowdelegate.h>
#include <openspace/engine/globals.h>
#include <openspace/engine/windowdelegate.h>
#include <ghoul/fmt.h>
#include <ghoul/filesystem/file.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/misc/assert.h>
namespace {
constexpr const char* _loggerCat = "CEF BrowserInstance";
@@ -75,10 +75,7 @@ void BrowserInstance::initialize() {
}
void BrowserInstance::loadUrl(const std::string& url) {
// @TODO: This should be removed
if (!_isInitialized) {
initialize();
}
ghoul_assert(_isInitialized, "BrowserInstance should be initialized");
LDEBUG(fmt::format("Loading URL: {}", url));
_browser->GetMainFrame()->LoadURL(url);