mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-30 15:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix how global she::System singleton is set

Browse Source 
This is to avoid special cases were an exception is thrown,
the she::System is deleted, and (an invalid) g_instance is used to
log this last exception message.
This commit is contained in:
David Capello 2015-03-26 09:30:11 -03:00
parent a37fd89404
commit 995e09bb60
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/she/alleg4/she.cpp
View File

@ -95,6 +95,8 @@ static void resize_callback(RESIZE_DISPLAY_EVENT* ev)
}
#endif // ALLEGRO4_WITH_RESIZE_PATCH
static she::System* g_instance = nullptr;
namespace she {
class Alleg4EventQueue : public EventQueue {
@ -711,9 +713,13 @@ public:
// Register PNG as a supported bitmap type
register_bitmap_file_type("png", load_png, save_png);
g_instance = this;
}
~Alleg4System() {
g_instance = nullptr;
remove_timer();
allegro_exit();
}
@ -762,10 +768,8 @@ public:
};
static System* g_instance;
System* create_system() {
return g_instance = new Alleg4System();
return new Alleg4System();
}
System* instance()