CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initialize propWindow with NULL first

Browse Source
This commit is contained in:
andreja6
2019-11-06 11:29:56 -08:00
parent b8c23348ba
commit 8848d37d0f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Application.cpp
View File

@@ -42,7 +42,6 @@ static bool mouseMovedBeginMotion = false;
static POINT oldGlobalMouse; static POINT oldGlobalMouse;
Vector2 oldMouse = Vector2(0,0); Vector2 oldMouse = Vector2(0,0);
float moveRate = 0.5; float moveRate = 0.5;
bool ready = false;
void Application::clearInstances() void Application::clearInstances()
{ {
@@ -57,7 +56,7 @@ PartInstance* Application::makePart()
void Application::setFocus(bool focus) void Application::setFocus(bool focus)
{ {
if(_propWindow != NULL && ready) if(_propWindow != NULL)
if(focus) if(focus)
{ {
ShowWindow(_propWindow->_hwndProp, SW_SHOW); ShowWindow(_propWindow->_hwndProp, SW_SHOW);
@@ -69,7 +68,7 @@ void Application::setFocus(bool focus)
} }
} }
Application::Application(HWND parentWindow) { //: GApp(settings,window) { Application::Application(HWND parentWindow) : _propWindow(NULL) { //: GApp(settings,window) {
std::string tempPath = ((std::string)getenv("temp")) + "/"+g_PlaceholderName; std::string tempPath = ((std::string)getenv("temp")) + "/"+g_PlaceholderName;
@@ -138,7 +137,6 @@ Application::Application(HWND parentWindow) { //: GApp(settings,window) {
_propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance); _propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance);
IEBrowser* webBrowser = new IEBrowser(_hwndToolbox); IEBrowser* webBrowser = new IEBrowser(_hwndToolbox);
//webBrowser->navigateSyncURL(L"http://scottbeebiwan.tk/g3d/toolbox/"); //webBrowser->navigateSyncURL(L"http://scottbeebiwan.tk/g3d/toolbox/");
ready = true;
} }