diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2006-04-17 05:01:33 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2006-04-17 05:01:33 +0000 |
commit | 9f2be9b17f4e3e1b418e2e8513a6f28b496354fe (patch) | |
tree | dc308c70e35059cfa3e303709d2ba2b4ce80e33b | |
parent | b0722d11c11c9824fce7bec1b2fb48d84b8f6ff3 (diff) | |
download | rockbox-9f2be9b17f4e3e1b418e2e8513a6f28b496354fe.tar.gz rockbox-9f2be9b17f4e3e1b418e2e8513a6f28b496354fe.zip |
Add in error return if appropriate.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9702 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index 23d977b876..49c78be18a 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -778,8 +778,8 @@ int doom_menu() | |||
778 | 778 | ||
779 | if( (status=Dbuild_base(names)) == 0 ) // Build up the base wad files (select last added file) | 779 | if( (status=Dbuild_base(names)) == 0 ) // Build up the base wad files (select last added file) |
780 | { | 780 | { |
781 | rb->splash(HZ, true, "Missing Base WAD!"); | 781 | rb->splash(HZ*2, true, "Missing Base WAD!"); |
782 | return -1; | 782 | return -2; |
783 | } | 783 | } |
784 | 784 | ||
785 | int numadd=Dbuild_filelistm(&addons, "No Addon", GAMEBASE"addons/", ".WAD" ); | 785 | int numadd=Dbuild_filelistm(&addons, "No Addon", GAMEBASE"addons/", ".WAD" ); |
@@ -882,9 +882,11 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
882 | myargv =0; | 882 | myargv =0; |
883 | myargc=0; | 883 | myargc=0; |
884 | 884 | ||
885 | int result=doom_menu(); | 885 | rb->lcd_clear_display(); |
886 | 886 | ||
887 | if( result == -1) return PLUGIN_OK; // No base wads found or quit was selected | 887 | int result = doom_menu(); |
888 | if( result == -1 ) return PLUGIN_OK; // Quit was selected | ||
889 | else if( result == -2 ) return PLUGIN_ERROR; // Missing base wads | ||
888 | 890 | ||
889 | Dhandle_ver( namemap[ result ] ); | 891 | Dhandle_ver( namemap[ result ] ); |
890 | 892 | ||