summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-01-24 12:04:27 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-01-24 12:04:27 +0100
commit1ebf213faba82e93510ab689ea9a7ce92033a56a (patch)
tree17b2e60c5edabf933cf77db5497f2d3dbfbe10db /src
parent35cb994948858219a125f648c464ff2c0178bd73 (diff)
downloadmana-client-1ebf213faba82e93510ab689ea9a7ce92033a56a.tar.gz
mana-client-1ebf213faba82e93510ab689ea9a7ce92033a56a.tar.bz2
mana-client-1ebf213faba82e93510ab689ea9a7ce92033a56a.tar.xz
mana-client-1ebf213faba82e93510ab689ea9a7ce92033a56a.zip
Fixed potential crash on exit
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp3
-rw-r--r--src/resources/settingsmanager.cpp4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 92c8c63a..b7dca379 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -761,8 +761,7 @@ int Client::exec()
// Load XML databases
CharDB::load();
- if (itemDb)
- delete itemDb;
+ delete itemDb;
switch (Net::getNetworkType())
{
diff --git a/src/resources/settingsmanager.cpp b/src/resources/settingsmanager.cpp
index 940ebb59..a26fae9d 100644
--- a/src/resources/settingsmanager.cpp
+++ b/src/resources/settingsmanager.cpp
@@ -85,7 +85,8 @@ namespace SettingsManager
NPCDB::unload();
SpecialDB::unload();
MonsterDB::unload();
- itemDb->unload();
+ if (itemDb)
+ itemDb->unload();
hairDB.unload();
Attributes::unload();
}
@@ -209,4 +210,3 @@ namespace SettingsManager
}
}
-