games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-03 23:19:22 +02:00
Code Issues Releases Activity

Merge branch 'vcmi/master' into 'vcmi/develop'

Browse Source
This commit is contained in:
Ivan Savenko
2024-05-31 09:34:21 +00:00
parent adc3441bda 9121fcdc97
commit df83fa33a1
166 changed files with 2893 additions and 1363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/CMT.cpp
View File

@@ -435,6 +435,8 @@ static void mainLoop()
[[noreturn]] static void quitApplication()
{
CSH->endNetwork();
if(!settings["session"]["headless"].Bool())
{
if(CSH->client)
@@ -443,6 +445,8 @@ static void mainLoop()
GH.windows().clear();
}
vstd::clear_pointer(CSH);
CMM.reset();
if(!settings["session"]["headless"].Bool())
@@ -463,7 +467,6 @@ static void mainLoop()
vstd::clear_pointer(graphics);
}
vstd::clear_pointer(CSH);
vstd::clear_pointer(VLC);
// sometimes leads to a hang. TODO: investigate