From d358bdbc87a3605e1b16ff8369c44204841e666f Mon Sep 17 00:00:00 2001
From: Chris Andriessen <50437199+ChrisAnd1998@users.noreply.github.com>
Date: Sun, 23 Jan 2022 09:55:06 +0100
Subject: [PATCH] Add files via upload

---
 Taskbar11/Taskbar11.cpp     | 9 ++++++---
 Taskbar11/Taskbar11.vcxproj | 2 --
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Taskbar11/Taskbar11.cpp b/Taskbar11/Taskbar11.cpp
index c1bd12d..da239f9 100644
--- a/Taskbar11/Taskbar11.cpp
+++ b/Taskbar11/Taskbar11.cpp
@@ -9,7 +9,7 @@
 
 #include <iostream>
 #include <thread>
-#include <dwmapi.h> 
+#include <dwmapi.h>
 
 //Notifyicon
 #include <shellapi.h>
@@ -264,7 +264,7 @@ void remove_startup() {
 	LONG createStatus = RegOpenKey(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", &hkey);
 	LONG status = RegDeleteValue(hkey, L"TaskbarXI");
 	RegCloseKey(hkey);
-	exit(0);
+	exiting();
 }
 
 HRESULT UpdateWindows11RoundCorners(HWND hWnd)
@@ -555,6 +555,7 @@ int WINAPI WinMain(_In_opt_ HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR
 			//freopen_s(&fpstdin, "CONIN$", "r", stdin);
 			freopen_s(&fpstdout, "CONOUT$", "w", stdout);
 			freopen_s(&fpstderr, "CONOUT$", "w", stderr);
+			cur_cmd.append(" -console");
 		}
 		if (wcscmp(szArgList[i], L"-help") == 0) {
 			AllocConsole();
@@ -603,6 +604,7 @@ int WINAPI WinMain(_In_opt_ HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR
 			std::wcout << "EXAMPLE: TaskbarXI.exe -ignoremax -expandspeed 100 -square ";
 
 			FreeConsole();
+
 		}
 	}
 
@@ -733,6 +735,7 @@ int WINAPI WinMain(_In_opt_ HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR
 
 	if (removestartup == 1) {
 		remove_startup();
+		exiting();
 	}
 
 	if (blur == 1) {
@@ -1406,4 +1409,4 @@ BOOL CALLBACK EnumCallbackInstances(HWND hWND, LPARAM lParam) {
 	length = NULL;
 
 	return true;
-}
+}
\ No newline at end of file
diff --git a/Taskbar11/Taskbar11.vcxproj b/Taskbar11/Taskbar11.vcxproj
index c1a5fdf..25a7699 100644
--- a/Taskbar11/Taskbar11.vcxproj
+++ b/Taskbar11/Taskbar11.vcxproj
@@ -76,8 +76,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>TaskbarXI</TargetName>
-    <IntDir>$(Configuration)\</IntDir>
-    <OutDir>$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>