From 05124ac40678a97cb93792826356d777de20facb Mon Sep 17 00:00:00 2001
From: PopSlime <popslime@qq.com>
Date: Thu, 17 Nov 2022 11:57:56 +0800
Subject: [PATCH] Blocks ruleset config if ruleset not found.

---
 Assets/Config.unity                        | Bin 73541 -> 73549 bytes
 Assets/Cryville/Crtr/Config/ConfigScene.cs |  13 +++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Assets/Config.unity b/Assets/Config.unity
index 35218822d02011d4b81bfe6f9dad68716abec8eb..d3e929f493867207bc61482afe8407b19fc47a23 100644
GIT binary patch
delta 1651
zcmYL}U1$_n6vxljw8k34ZvB{@s&!K}#t;0et)W`owSJ4@)>K!}kf00t(6|xPZt)?z
z#e#}L!hu#nLQ)VSB5bfiUX+bdyNOgbgu<3Sm<Wo#Xtuui=>N<;H#6|(p8Nluxik0N
zGxP9X#ozZTIu-=>_C+T0p{fsvs)=adi=~S(P=;#;9JhY9#6(|0Q=uCdf2oyuisPU(
zM`EH9^dWRpX^FFPuOkdAK|$!2(thp(4ToXj%0d;;k<=q^<!&AaZE}SXC7>#(QE5Mi
z?mKSuQ(;7xA-VTh^vV*M7dZxcey+qs4bXHbsdS86L9fgc=I`j++MkxmyvRMEP4gut
z%0sfFZAv3N0$TbE7A{+j9ZG{77<Agx5f4u8sFp`pcutM+dojqGOVsaG-|n%_=6`PT
z&taGWl^Ua8iF024UlGf$|5ZP@P$=>5gCVzQV#>jo2K}cw86FsP-2O$9Nc00FD-1s^
zel7DlE`yFOme{ZAwV!hvWS-)h2aa3kRoJg;m(mQ!LF?-z)2~cr!@Er~PjMEMmP$<Y
zCnOd4SSdOIH0afzs2}7bs7h&p$K~GTuy9?4<efKFU)&<|ZVo+k+=QvH*C(IAjVjG?
z3^cz|GX0geC{1%KXl|9E*D=V-uluI#7AL_ypusf~(_|$ll;(K^G`!YO`_BI>Epp(I
z<5qrQ=m`unp*OFqyp>bD1~j<NP+N_%(gHVwMx?oL+3)eK($(Av`f|OYwgcC8UW<zp
z;Q`R@dP8lety8*_%b;QJto<_zwI4Vr`TM!%FRZN8zST^n-5du^Y&0v|=gwBz!CBA_
z@2vfA`TNmD($o~@KG6JTbFZz{A*E>^2hBwdwf}+k-%5wYspn7uJsC4pmXrTLc9O<G
z^Ij(qb%MwVj@^0Ehyf?q3L4xhv44Wkl;*hyG`-DGyQ4qu9!+}LJOUcoZm6xs^h}pW
zOB@(-+7mkrwRN7Mly(}wfT0qqR==RWeb$?QMo)T~yG(u?26_Jp_0#HKf;S5)t6%AL
z5x(@Hkee~_<aaT5^Mx}=l};GKpK6c9MCStJ{iNqBZQ?R$c%Py6eVU)|J}VA7Vc2me
zl-j)?Q`*aM(A8eQ`QKDh>C4;M;m32r((VVEe@w<&j(?Xt({{S0;ndz_OB>xjGXCnD
E_Xde5+5i9m

delta 1643
zcmYL}TWC~Q6o%Jmw4=r_<L%7xns|w6ks5DRyiTmCH!7Jnwh?MTbYOf?Ct@(thh#)S
zMZvH@M-VZBFhvRzY++uMNuzcWQ4)eM;)99MQeQNqFZ0-coxOI>fq(Ye|F`#^v)5kx
zym(yk^l`=YC4t7?>hXNIViHjm5gqvV%N1y-gKPR6w|=g~L>r(lpx>^Xua$m+W1wZF
zML1KS2TF%HC377aNz?^}px>2dxfe7PfrTdpRY1QapLr{%c?`706-LwoRYI*wvmE}*
zaW~BuMsy95xksbvmC`S818CO*iHVw_8Bknlk=sD8FBInQ=-b+}UrE2fJ)kX%Bqqv3
zvZF?&5grB|S_})1&Bkt}K@RjgoylqsPVA_bM^=ebRzHJS)?BIn-5PZ8*ge+S@#<dy
zn+X+Lqu<E5uBGxzbP<wWzg9oEOkCod{b9FYV#>mp2EEZS9o*ONxY^}0kmv*?D-6CJ
z+ARHQE`b(TNbG0z_POj9=_k16iQ`s#8TPY!M`;JgK<n#dq@S5!b9uY;6PyAqEBynG
zWMH~dR03$w%Rf;LWGYmtG|yu)SLrPfdFSm_S9YSIG>4x$Zj+Z`lfzkXqe?T}0Gj(+
zM*1u7RGQ>A(9CK>@1v2GKlD!CCr%UhfCkq{OcR+LSDNEt(9l{#?K^)`THwGl$E9_K
zCeX}=K7Oe5R!;C5(BOJQZ8l0u^Lzv}BE^NLQt#turFGm5I=azNTY+o4Z^y)ma35%T
zlcBcK)+>#22{h!LwSPw8&L4l0@q4)DZ>+4;zSV4{X^w$5Z8a;~|DCJ!5~n~fd1vk4
z<%1*3rKl;yy`Z@rX0FZE&q|X#2AYW)YQF=WH;RYEspoJ3HQ8XOEGOTA)C6q+&3TnT
z)D0phIQr+yRx~)lHqhWMiTx9Nr!>bspvgu<?T+p}Ivf`#!^5DF?+mrsn9+5|qeC1R
za5|fI8*1}BQ)yZK0&ozjQa``PjJN;w@zuz2amwnqBbN6cS3kK|DA84D4pdT~yeh&?
z9|*f0CMJ6?7VNluM&_Ur2JofYFEP=D0MR_Oi<Gu-2{d%TgA?DeBmeCCRUA~ppyU3h
w)b9PL(z_f3t@G;5zf*CgqYqPq&*z2Ykba1tX+M3k`PBFElkE?WjlJLYKik|X@&Et;

diff --git a/Assets/Cryville/Crtr/Config/ConfigScene.cs b/Assets/Cryville/Crtr/Config/ConfigScene.cs
index 4507775..5ab46dd 100644
--- a/Assets/Cryville/Crtr/Config/ConfigScene.cs
+++ b/Assets/Cryville/Crtr/Config/ConfigScene.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
 using System;
 using System.IO;
 using System.Text;
@@ -24,6 +25,11 @@ namespace Cryville.Crtr.Config {
 			FileInfo file = new FileInfo(
 				Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
 			);
+			if (!file.Exists) {
+				Popup.Create("Ruleset for the chart not found\nMake sure you have imported the ruleset");
+				ReturnToMenu();
+				return;
+			}
 			DirectoryInfo dir = file.Directory;
 			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
 				ruleset = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd(), new JsonSerializerSettings() {
@@ -62,7 +68,7 @@ namespace Cryville.Crtr.Config {
 			cat.SetActive(true);
 		}
 
-		public void ReturnToMenu() {
+		public void SaveAndReturnToMenu() {
 			Game.InputManager.Deactivate();
 			m_inputConfigPanel.proxy.SaveTo(_rscfg.inputs);
 			m_inputConfigPanel.proxy.Dispose();
@@ -72,6 +78,9 @@ namespace Cryville.Crtr.Config {
 			using (StreamWriter cfgwriter = new StreamWriter(cfgfile.FullName, false, Encoding.UTF8)) {
 				cfgwriter.Write(JsonConvert.SerializeObject(_rscfg, Game.GlobalJsonSerializerSettings));
 			}
+			ReturnToMenu();
+		}
+		public void ReturnToMenu() {
 			GameObject.Find("Master").GetComponent<Master>().ShowMenu();
 #if UNITY_5_5_OR_NEWER
 			SceneManager.UnloadSceneAsync("Config");