Merge branch 'master' of https://github.com/Fluorohydride/ygopro

gframe/deck_con.cpp

@@ -776,6 +776,8 @@ void DeckBuilder::FilterCards() {
 	unsigned int set_code = 0;
 	if(pstr[0] == L'@')
 		set_code = dataManager.GetSetCode(&pstr[1]);
+	else
+		set_code = dataManager.GetSetCode(&pstr[0]);
 	if(pstr[0] == 0 || (pstr[0] == L'$' && pstr[1] == 0) || (pstr[0] == L'@' && pstr[1] == 0))
 		pstr = 0;
 	auto strpointer = dataManager._strings.begin();
@@ -854,11 +856,9 @@ void DeckBuilder::FilterCards() {
 			} else if(pstr[0] == L'@' && set_code) {
 				if(!check_set_code(data, set_code)) continue;
 			} else {
-				if(wcsstr(text.name, pstr) == 0 && wcsstr(text.text, pstr) == 0) {
-					set_code = dataManager.GetSetCode(&pstr[0]);
-					if(!set_code || !check_set_code(data, set_code))
-						continue;
-				}
+				if(wcsstr(text.name, pstr) == 0 && wcsstr(text.text, pstr) == 0
+					&& (!set_code || !check_set_code(data, set_code)))
+					continue;
 			}
 		}
 		results.push_back(ptr);

ocgcore @ 96bbbedb

-Subproject commit 800ecbbf27bab7de6de02cf610946b678b2ff047
+Subproject commit 96bbbedb6e828f4a227cf5405ed8e284b0def2cc

script @ 5485784e

-Subproject commit 6505dc223d9754281c1b5bbd8605effdff33ff8a
+Subproject commit 5485784eac297306878f20f2c6cd4a0a51698653