From bf13d69f9a61484360db095ad0fd44bd236e365a Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Fri, 3 Jan 2020 20:06:55 +1100
Subject: [PATCH] Fix on windows, if you maximise the window then press F11,
 the window completely disappears instead of going fullscreen

---
 src/LWeb.c   | 16 ++++++++--------
 src/Window.c |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/LWeb.c b/src/LWeb.c
index 0aa031fe3..6eebdf997 100644
--- a/src/LWeb.c
+++ b/src/LWeb.c
@@ -182,7 +182,7 @@ void Json_Parse(struct JsonContext* ctx) {
 static void Json_Handle(cc_uint8* data, cc_uint32 len, 
 						JsonOnValue onVal, JsonOnNew newArr, JsonOnNew newObj) {
 	struct JsonContext ctx;
-	/* NOTE: classicube.net uses \u JSON for non ASCII, no need to UTF8 convert characters */
+	/* NOTE: classicube.net uses \u JSON for non ASCII, no need to UTF8 convert characters here */
 	String str = String_Init((char*)data, len, len);
 	Json_Init(&ctx, &str);
 	
@@ -263,7 +263,7 @@ void GetTokenTask_Run(void) {
 *--------------------------------------------------------SignInTask-------------------------------------------------------*
 *#########################################################################################################################*/
 struct SignInTaskData SignInTask;
-char userBuffer[STRING_SIZE];
+static char userBuffer[STRING_SIZE];
 
 static void SignInTask_LogError(const String* str) {
 	if (String_CaselessEqualsConst(str, "username") || String_CaselessEqualsConst(str, "password")) {
@@ -295,20 +295,20 @@ static void SignInTask_Append(String* dst, const char* key, const String* value)
 void SignInTask_Run(const String* user, const String* pass) {
 	static const String id  = String_FromConst("CC post login");
 	static const String url = String_FromConst("https://www.classicube.net/api/login");
-	String tmp; char tmpBuffer[384];
+	String args; char argsBuffer[384];
 	if (SignInTask.Base.working) return;
 
 	LWebTask_Reset(&SignInTask.Base);
 	String_InitArray(SignInTask.username, userBuffer);
 	SignInTask.error = NULL;
 
-	String_InitArray(tmp, tmpBuffer);
-	SignInTask_Append(&tmp, "username=",  user);
-	SignInTask_Append(&tmp, "&password=", pass);
-	SignInTask_Append(&tmp, "&token=",    &GetTokenTask.token);
+	String_InitArray(args, argsBuffer);
+	SignInTask_Append(&args, "username=",  user);
+	SignInTask_Append(&args, "&password=", pass);
+	SignInTask_Append(&args, "&token=",    &GetTokenTask.token);
 
 	SignInTask.Base.identifier = id;
-	Http_AsyncPostData(&url, false, &id, tmp.buffer, tmp.length, &ccCookies);
+	Http_AsyncPostData(&url, false, &id, args.buffer, args.length, &ccCookies);
 	SignInTask.Base.Handle     = SignInTask_Handle;
 }
 
diff --git a/src/Window.c b/src/Window.c
index 1ed334746..2e9886dce 100644
--- a/src/Window.c
+++ b/src/Window.c
@@ -492,10 +492,10 @@ void Window_Show(void) {
 }
 
 int Window_GetWindowState(void) {
-	DWORD style = GetWindowLong(win_handle, GWL_STYLE);
+	DWORD s = GetWindowLong(win_handle, GWL_STYLE);
 
-	if (style & WS_MINIMIZE)              return WINDOW_STATE_MINIMISED;
-	if (style & (WS_MAXIMIZE | WS_POPUP)) return WINDOW_STATE_FULLSCREEN;
+	if ((s & WS_MINIMIZE))                   return WINDOW_STATE_MINIMISED;
+	if ((s & WS_MAXIMIZE) && (s & WS_POPUP)) return WINDOW_STATE_FULLSCREEN;
 	return WINDOW_STATE_NORMAL;
 }