From e8c40a99cb00ea7f68dcb1b8414065785c89df9c Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 10 Apr 2022 15:00:09 +0200 Subject: Removed unused static pointer to loader instance --- StarsEx/DataLoader.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'StarsEx') diff --git a/StarsEx/DataLoader.cpp b/StarsEx/DataLoader.cpp index 22ac803..4e35cab 100644 --- a/StarsEx/DataLoader.cpp +++ b/StarsEx/DataLoader.cpp @@ -20,7 +20,6 @@ // +------------------------------------------------------------------+ -static DataLoader* def_loader = 0; DataLoader* DataLoader::loader = 0; static List archives; @@ -44,10 +43,10 @@ DataLoader::UseVideo(Video* v) void DataLoader::Initialize() { - def_loader = new DataLoader; - loader = def_loader; - - archives.destroy(); + if (!loader) { + loader = new DataLoader; + archives.destroy(); + } } void @@ -55,10 +54,8 @@ DataLoader::Close() { archives.destroy(); Bitmap::ClearCache(); - - delete def_loader; - def_loader = 0; - loader = 0; + delete loader; + loader = nullptr; } void -- cgit v1.1