diff --git a/client/widgets/TextControls.cpp b/client/widgets/TextControls.cpp index 58afa887f..9e095005c 100644 --- a/client/widgets/TextControls.cpp +++ b/client/widgets/TextControls.cpp @@ -376,11 +376,6 @@ CGStatusBar::CGStatusBar(int x, int y, std::string name, int maxw) autoRedraw = false; } -CGStatusBar::~CGStatusBar() -{ - GH.statusbar = oldStatusBar; -} - void CGStatusBar::show(SDL_Surface * to) { showAll(to); @@ -388,7 +383,6 @@ void CGStatusBar::show(SDL_Surface * to) void CGStatusBar::init() { - oldStatusBar = GH.statusbar; GH.statusbar = shared_from_this(); } diff --git a/client/widgets/TextControls.h b/client/widgets/TextControls.h index 835b1f059..93545174d 100644 --- a/client/widgets/TextControls.h +++ b/client/widgets/TextControls.h @@ -119,8 +119,6 @@ class CGStatusBar : public CLabel, public std::enable_shared_from_this oldStatusBar; - CGStatusBar(std::shared_ptr background_, EFonts Font = FONT_SMALL, EAlignment Align = CENTER, const SDL_Color & Color = Colors::WHITE); CGStatusBar(int x, int y, std::string name, int maxw = -1); protected: @@ -139,8 +137,6 @@ public: void show(SDL_Surface * to) override; //shows statusbar (with current text) - ~CGStatusBar(); - void lock(bool shouldLock); //If true, current text cannot be changed until lock(false) is called };