Merge branch 'master' of https://bitbucket.org/4coder/4coder

2016-09-04 22:59:09 -04:00 · 2016-09-04 22:59:09 -04:00 · d70d151e28
parent 434e1315b6 91f694ba5d
commit d70d151e28
1 changed files with 7 additions and 0 deletions
--- a/linux_4ed.cpp
+++ b/linux_4ed.cpp
@ -2643,6 +2643,8 @@ LinuxX11WindowInit(int argc, char** argv, int* WinWidth, int* WinHeight)
    };

    XSetWMProtocols(linuxvars.XDisplay, linuxvars.XWindow, wm_protos, 2);
+
+    return true;
 }

 internal void
@ -3471,6 +3473,11 @@ main(int argc, char **argv)
        }
    }

+    if(linuxvars.XDisplay){
+        if(linuxvars.XWindow) XDestroyWindow(linuxvars.XDisplay, linuxvars.XWindow);
+        XCloseDisplay(linuxvars.XDisplay);
+    }
+
    return 0;
 }