From 787e756cd17b3af27187a8c19135088d7181cdea Mon Sep 17 00:00:00 2001
From: Yuki <YukihoAA@gmail.com>
Date: Tue, 19 Feb 2019 23:52:44 +0900
Subject: [PATCH] bugfix

---
 waifu2x_snowshell/Main.cpp             |   4 ++--
 waifu2x_snowshell/SnowSetting.cpp      |   2 +-
 waifu2x_snowshell/waifu2x_snowshell.rc | Bin 13980 -> 13980 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/waifu2x_snowshell/Main.cpp b/waifu2x_snowshell/Main.cpp
index c916f73..db95202 100644
--- a/waifu2x_snowshell/Main.cpp
+++ b/waifu2x_snowshell/Main.cpp
@@ -27,7 +27,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR lpCmdL
 	// OpenCV 3.1 and later version does not supports x86 system.
 	IsWow64Process(GetCurrentProcess(), &is64bit);
 
-	hWnd = CreateWindow(lpszClass, L"waifu2x - Snowshell v1.8.3", WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_BORDER, CW_USEDEFAULT, CW_USEDEFAULT, 530, 370, NULL, NULL, hInstance, NULL);
+	hWnd = CreateWindow(lpszClass, L"waifu2x - Snowshell v1.8.4", WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_BORDER, CW_USEDEFAULT, CW_USEDEFAULT, 530, 370, NULL, NULL, hInstance, NULL);
 
 	ShowWindow(hWnd, nCmdShow);
 
@@ -369,7 +369,7 @@ BOOL Execute(HWND hWnd, ConvertOption *convertOption, LPCWSTR fileName, bool noL
 	// Set Converter
 	if (SnowSetting::CONVERTER_CAFFE.getAvailable() && SnowSetting::getCPU() != CPU_MID && SnowSetting::getCudaAvailable()) {
 		SnowSetting::CurrentConverter = &SnowSetting::CONVERTER_CAFFE;
-		if (!(SnowSetting::CONVERTER_CPP_x64.getAvailable() || SnowSetting::CONVERTER_CPP_x86.getAvailable()))
+		if (!SnowSetting::CONVERTER_CPP_x64.getAvailable())
 			convertOption->setForceCPU(true);
 	}
 	else if (SnowSetting::CONVERTER_CPP_x64.getAvailable()) {
diff --git a/waifu2x_snowshell/SnowSetting.cpp b/waifu2x_snowshell/SnowSetting.cpp
index 9585e30..87ce797 100644
--- a/waifu2x_snowshell/SnowSetting.cpp
+++ b/waifu2x_snowshell/SnowSetting.cpp
@@ -598,8 +598,8 @@ bool SnowSetting::loadSetting()
 	GetPrivateProfileStringW(Section.c_str(), L"waifu2x_converter_cpp_x86", L"", buf, MAX_PATH, INIPath.c_str());
 	CONVERTER_CPP_x86.setOptionString(buf);
 
-
 	IsCudaAvailable = checkCuda();
+
 	return true;
 }
 
diff --git a/waifu2x_snowshell/waifu2x_snowshell.rc b/waifu2x_snowshell/waifu2x_snowshell.rc
index 2d820e24a7745e0df3503280845c091df5673215..0b32778f5006d44dadd188831c5c6ae08993562c 100644
GIT binary patch
delta 60
zcmbP}J12KTl_I0b<Z4AjMw88J6?ZeSnlR`w7)*{=)!jTxMUIgj%w<rTtjHre*^5hP
O@;h;^%^y_P2mk;nff0ZJ

delta 60
zcmbP}J12KTl_I0@<Z4AjM&r$E6?ZeS8Z+oI7)*{=)!jTxMUIgj%w<rTtjHre*^5hP
O@;h;^%^y_P2mk;m;1PTP