diff options
| -rw-r--r-- | rbutil/credits.h | 2 | ||||
| -rw-r--r-- | rbutil/rbutil-rc.rc | 8 | ||||
| -rw-r--r-- | rbutil/rbutil.cpp | 9 |
3 files changed, 14 insertions, 5 deletions
diff --git a/rbutil/credits.h b/rbutil/credits.h index b783d29..867661b 100644 --- a/rbutil/credits.h +++ b/rbutil/credits.h @@ -22,7 +22,7 @@ #define CREDITS_H_INCLUDED #define RBUTIL_FULLNAME "The Rockbox Utility" -#define RBUTIL_VERSION "Version 0.2.1.0" +#define RBUTIL_VERSION "Version 0.2.1.1" static const char* rbutil_developers[] = { "Christi Alice Scarborough", diff --git a/rbutil/rbutil-rc.rc b/rbutil/rbutil-rc.rc index 986bd58..756b65f 100644 --- a/rbutil/rbutil-rc.rc +++ b/rbutil/rbutil-rc.rc @@ -1,8 +1,8 @@ #define RBUTIL 1 #include <wx/msw/wx.rc> RBUTIL VERSIONINFO -FILEVERSION 0,2,1,0 -PRODUCTVERSION 0,2,1,0 +FILEVERSION 0,2,1,1 +PRODUCTVERSION 0,2,1,1 FILEOS 0x00000004 FILETYPE 0x00000001 BEGIN @@ -10,8 +10,8 @@ BEGIN BEGIN BLOCK "FFFF0000" BEGIN - VALUE "FileVersion", "0.2.1.0\0" - VALUE "ProductVersion", "0.2.1.0\0" + VALUE "FileVersion", "0.2.1.1\0" + VALUE "ProductVersion", "0.2.1.1\0" VALUE "CompanyName", "Rockbox Team\0" VALUE "FileDescription", "Rockbox Utility\0" VALUE "InternalName", "rbutil\0" diff --git a/rbutil/rbutil.cpp b/rbutil/rbutil.cpp index 0adee68..b7a1fa6 100644 --- a/rbutil/rbutil.cpp +++ b/rbutil/rbutil.cpp @@ -432,6 +432,15 @@ int Uninstall(const wxString dir, bool isFullUninstall) { for (i = 0; i < totalfiles; i++) { + // If we're running on the device, let's not delete our own + // installation, eh? + if (gv->portable && + FilesToRemove->Item(i).StartsWith(wxT(PATH_SEP + "RockboxUtility")) ) + { + continue; + } + wxString* buf2 = new wxString; buf.Printf("%s%s", dir.c_str() , FilesToRemove->Item(i).c_str() ); buf2->Format(_("Deleting %s"), buf.c_str()); |