From: Ingo Ruhnke <grumbel@gmail.com>
Date: Mon, 18 Aug 2014 00:47:43 +0000 (+0200)
Subject: Fixed initialisation order issue in GLVideoSystem
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=370daa152883377f23c9f80fa95e2faaf6531e5c;p=supertux.git

Fixed initialisation order issue in GLVideoSystem
---

diff --git a/src/video/gl/gl_video_system.cpp b/src/video/gl/gl_video_system.cpp
index b19c9d968..dde614dba 100644
--- a/src/video/gl/gl_video_system.cpp
+++ b/src/video/gl/gl_video_system.cpp
@@ -23,9 +23,9 @@
 #include "video/texture_manager.hpp"
 
 GLVideoSystem::GLVideoSystem() :
+  m_texture_manager(new TextureManager),
   m_renderer(new GLRenderer),
-  m_lightmap(new GLLightmap),
-  m_texture_manager(new TextureManager)
+  m_lightmap(new GLLightmap)
 {
 }
 
diff --git a/src/video/gl/gl_video_system.hpp b/src/video/gl/gl_video_system.hpp
index 34fbb8fbf..6928f7152 100644
--- a/src/video/gl/gl_video_system.hpp
+++ b/src/video/gl/gl_video_system.hpp
@@ -27,9 +27,9 @@ class TextureManager;
 class GLVideoSystem : public VideoSystem
 {
 private:
+  std::unique_ptr<TextureManager> m_texture_manager;
   std::unique_ptr<Renderer> m_renderer;
   std::unique_ptr<Lightmap> m_lightmap;
-  std::unique_ptr<TextureManager> m_texture_manager;
 
 public:
   GLVideoSystem();