merge

Docs/Changelog_sm-ssc.txt

@@ -13,6 +13,13 @@ _____________________________________________________________________________
 sm-ssc v1.2.4 | 20110???
 --------------------------------------------------------------------------------
 
+20110317
+--------
+* [ScreenEdit] Fix bug number 222, where Steps disappeared if they weren't
+  saved. [AJ, Wolfman2000]
+* [ScreenOptionsEdit] Fix bug number 186, where people could try to edit or
+  share songs when they didn't have any. [Wolfman2000]
+
 20110316
 --------
 * [NotesLoaderSMA] Allow for preliminary support of loading SMA files. This

Themes/_fallback/Scripts/02 Branches.lua

@@ -71,6 +71,13 @@ Branch = {
 		end;
 		return "ScreenSelectProfile";
 	end,
+	OptionsEdit = function()
+		-- Similar to above, don't let anyone in here with 0 songs.
+		if SONGMAN:GetNumSongs() == 0 and SONGMAN:GetNumAdditionalSongs() == 0 then
+			return "ScreenHowToInstallSongs";
+		end;
+		return "ScreenOptionsEdit";
+	end,
 	AfterProfileLoad = function()
 		return "ScreenSelectProfile"
 	end,

Themes/_fallback/metrics.ini

@@ -1657,7 +1657,7 @@ Choice1="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame()
 Choice2="screen,ScreenNetworkOptions;text,Play Online"
 Choice3="screen,ScreenSelectGame;text,Select Game"
 Choice4="screen,ScreenOptionsService;text,Options"
-Choice5="screen,ScreenOptionsEdit;text,Edit/Share"
+Choice5="text,Edit/Share;screen,"..Branch.OptionsEdit()
 Choice6="screen,ScreenJukeboxMenu;text,Jukebox"
 Choice7="screen,ScreenExit;text,Exit"
 Choice8="screen,ScreenTest;text,Sandbox"