Commite29680f

committed

fix nullref for initscript folder#207

1 parentb9a37eb commite29680fCopy full SHA for e29680f

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2095,6 +2095,11 @@ void CreateNewEmptyProject(string targetFolder = null)`
`2095`	`2095`	`}`
`2096`	`2096`	`}`
`2097`	`2097`
	`2098`	`+if(string.IsNullOrEmpty(initScriptFileFullPath)==true)`
	`2099`	`+{`
	`2100`	`+initScriptFileFullPath=Tools.GetSafeFilePath("Scripts","InitializeProject.cs");`
	`2101`	`+}`
	`2102`	`+`
`2098`	`2103`	`// for new projects created from explorer, always ask for name`
`2099`	`2104`	`if(chkAskNameForQuickProject.IsChecked==true\|\|targetFolder!=null)`
`2100`	`2105`	`{`
`@@ -3486,6 +3491,11 @@ private void btnExploreScriptsFolder_Click(object sender, RoutedEventArgs e)`
`3486`	`3491`	`{`
`3487`	`3492`	`if(Tools.LaunchExplorer(Path.GetDirectoryName(initScriptFileFullPath))==false)`
`3488`	`3493`	`{`
	`3494`	`+if(string.IsNullOrEmpty(initScriptFileFullPath)==true)`
	`3495`	`+{`
	`3496`	`+initScriptFileFullPath=Tools.GetSafeFilePath("Scripts","InitializeProject.cs");`
	`3497`	`+}`
	`3498`	`+`
`3489`	`3499`	`// if failed, open parent folder (probably path was using URL or no scripts yet)`
`3490`	`3500`	`varparentPath=Directory.GetParent(Path.GetDirectoryName(initScriptFileFullPath)).FullName;`
`3491`	`3501`	`if(Tools.LaunchExplorer(parentPath)==false)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -455,6 +455,8 @@ public static string GetUnityExePath(string version)`
`455`	`455`	`// opens Explorer to target folder`
`456`	`456`	`publicstaticboolLaunchExplorer(stringfolder)`
`457`	`457`	`{`
	`458`	`+if(folder==null\|\|folder.Length<1)returnfalse;`
	`459`	`+`
`458`	`460`	`if(Directory.Exists(folder)==true)`
`459`	`461`	`{`
`460`	`462`	`Process.Start(folder);`

Comments

(0)