mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
restore inGuiThread flag
This commit is contained in:
parent
41a0319985
commit
d707e55472
@ -77,6 +77,8 @@ SDL_Texture * screenTexture = nullptr;
|
|||||||
|
|
||||||
#endif // VCMI_SDL1
|
#endif // VCMI_SDL1
|
||||||
|
|
||||||
|
extern boost::thread_specific_ptr<bool> inGuiThread;
|
||||||
|
|
||||||
SDL_Surface *screen = nullptr, //main screen surface
|
SDL_Surface *screen = nullptr, //main screen surface
|
||||||
*screen2 = nullptr,//and hlp surface (used to store not-active interfaces layer)
|
*screen2 = nullptr,//and hlp surface (used to store not-active interfaces layer)
|
||||||
*screenBuf = screen; //points to screen (if only advmapint is present) or screen2 (else) - should be used when updating controls which are not regularly redrawed
|
*screenBuf = screen; //points to screen (if only advmapint is present) or screen2 (else) - should be used when updating controls which are not regularly redrawed
|
||||||
@ -1160,6 +1162,7 @@ static void mainLoop()
|
|||||||
SettingsListener resChanged = settings.listen["video"]["fullscreen"];
|
SettingsListener resChanged = settings.listen["video"]["fullscreen"];
|
||||||
resChanged([](const JsonNode &newState){ CGuiHandler::pushSDLEvent(SDL_USEREVENT, FULLSCREEN_TOGGLED); });
|
resChanged([](const JsonNode &newState){ CGuiHandler::pushSDLEvent(SDL_USEREVENT, FULLSCREEN_TOGGLED); });
|
||||||
|
|
||||||
|
inGuiThread.reset(new bool(true));
|
||||||
GH.mainFPSmng->init();
|
GH.mainFPSmng->init();
|
||||||
|
|
||||||
while(1) //main SDL events loop
|
while(1) //main SDL events loop
|
||||||
|
Loading…
Reference in New Issue
Block a user