Merge branch 'master' of https://github.com/86Box/86Box

.github/pull_request_template.md

@@ -2,17 +2,12 @@ Summary
 =======
 _Briefly describe what you are submitting._
 
-Approach
-========
-_How did you address the problem?_
-
 Checklist
 =========
-* [ ] Closes issue #xxx
+* [ ] Closes #xxx
 * [ ] I have discussed this with core contributors already
-* [ ] This pull request requires inclusion of a ROM in the romset
+* [ ] This pull request requires changes to the ROM set
   * [ ] I have opened a roms pull request - https://github.com/86Box/roms/pull/changeme/
-* [ ] My commit messages are descriptive and I have not added any irrelevant files to the repository
 
 References
 ==========

src/include/86box/win.h

@@ -99,6 +99,7 @@ extern HWND		hwndMain,
 extern HANDLE		ghMutex;
 extern LCID		lang_id;
 extern HICON		hIcon[256];
+extern RECT		oldclip;
 
 // extern int		status_is_open;
 

src/win/win_sdl.c

@@ -326,7 +326,7 @@ sdl_init_common(int flags)
     wchar_t temp[128];
     SDL_version ver;
     int w = 0, h = 0, x = 0, y = 0;
-    RECT rect, oldclip;
+    RECT rect;
 
     sdl_log("SDL: init (fs=%d)\n", fs);
 
@@ -389,8 +389,6 @@ sdl_init_common(int flags)
 	/* Now create the SDL window from that. */
 	sdl_win = SDL_CreateWindowFrom((void *)sdl_hwnd);
 
-	GetClipCursor(&oldclip);
-
 	old_capture = mouse_capture;
 
 	GetWindowRect(sdl_hwnd, &rect);

src/win/win_ui.c

@@ -1089,6 +1089,8 @@ ui_init(int nCmdShow)
     /* Make the window visible on the screen. */
     ShowWindow(hwnd, nCmdShow);
 
+    GetClipCursor(&oldclip);
+
     /* Initialize the RawInput (keyboard) module. */
     memset(&ridev, 0x00, sizeof(ridev));
     ridev.usUsagePage = 0x01;