3 files changed, 13 insertions, 8 deletions
diff --git a/src/libjin/render/canvas.cpp b/src/libjin/render/canvas.cpp
index fb84434..55a141b 100644
--- a/src/libjin/render/canvas.cpp
+++ b/src/libjin/render/canvas.cpp
@@ -106,7 +106,7 @@ namespace render
         cur = 0;
 
         glBindFramebuffer(GL_FRAMEBUFFER, 0);
-        Window* wnd = Window::get();
+        WindowSystem* wnd = WindowSystem::get();
         int ww = wnd->getW(),
             wh = wnd->getH();
 
diff --git a/src/libjin/render/window.cpp b/src/libjin/render/window.cpp
index 677618d..3357f07 100644
--- a/src/libjin/render/window.cpp
+++ b/src/libjin/render/window.cpp
@@ -12,7 +12,7 @@ namespace jin
 namespace render
 {
 
-    onlyonce bool Window::initSystem(const SettingBase* s)
+    onlyonce bool WindowSystem::initSystem(const SettingBase* s)
     {
         Loghelper::log(Loglevel::LV_INFO, "Init window system");
 
@@ -69,22 +69,22 @@ namespace render
         return true; 
     }
 
-    onlyonce void Window::quitSystem()
+    onlyonce void WindowSystem::quitSystem()
     {
         SDL_DestroyWindow(wnd);
     }
 
-    SDL_Window* Window::getWnd()
+    SDL_Window* WindowSystem::getWnd()
     {
         return wnd; 
     }
 
-    SDL_GLContext Window::getCtx()
+    SDL_GLContext WindowSystem::getCtx()
     {
         return ctx; 
     }
 
-    inline void Window::swapBuffers()
+    inline void WindowSystem::swapBuffers()
     {
         if (wnd)
             SDL_GL_SwapWindow(wnd);
diff --git a/src/libjin/render/window.h b/src/libjin/render/window.h
index 0c2c79d..c7e2651 100644
--- a/src/libjin/render/window.h
+++ b/src/libjin/render/window.h
@@ -9,7 +9,7 @@ namespace jin
 namespace render
 {
 
-    class Window : public Subsystem<Window>
+    class WindowSystem : public Subsystem<WindowSystem>
     {
     public: 
 
@@ -39,6 +39,11 @@ namespace render
 
     private:
 
+        WindowSystem() {};
+        virtual ~WindowSystem() {};
+
+        SINGLETON(WindowSystem);
+
         SDL_Window* wnd;
 
         SDL_GLContext ctx;
@@ -49,7 +54,7 @@ namespace render
         onlyonce void quitSystem() override;
     };
 
-    typedef Window::Setting WindowSetting;
+    typedef WindowSystem::Setting WindowSetting;
 
 }
 }