summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Wenger <domonoky@googlemail.com>2007-02-21 21:44:56 +0000
committerDominik Wenger <domonoky@googlemail.com>2007-02-21 21:44:56 +0000
commit1df59e1a0964692835128b78b0ce48dbe8d2d677 (patch)
tree641840fb1ab4d74c374c69457fa7cd7be25f2a81 /rbutil
parente863d595b50867c550d53cd9d92032fcbb82ef3c (diff)
downloadrockbox-1df59e1a0964692835128b78b0ce48dbe8d2d677.tar.gz
rockbox-1df59e1a0964692835128b78b0ce48dbe8d2d677.tar.bz2
rockbox-1df59e1a0964692835128b78b0ce48dbe8d2d677.zip
Fix bug with ipod bootloader installation, found by linuxstb
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12440 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/wizard_pages.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/rbutil/wizard_pages.cpp b/rbutil/wizard_pages.cpp
index 2c4c609271..e7eab77f4c 100644
--- a/rbutil/wizard_pages.cpp
+++ b/rbutil/wizard_pages.cpp
@@ -148,8 +148,8 @@ wxIpodLocationPage::wxIpodLocationPage(wxWizard* parent) : wxWizardPageSimple(pa
// Header text
IpodLocationLabel = new wxStaticText(this, wxID_ANY,
wxT("Rockbox utility needs to know the device where your ipod\n"
- "device is located on your computer. Rockbox utility\n"
- "has detected the following location:"));
+ "device is located on your computer. Use the\n"
+ "Scan Button:"));
WxBoxSizer1->Add(IpodLocationLabel,0,wxGROW | wxALL, 5);
// device location
@@ -208,13 +208,16 @@ void wxIpodLocationPage::OnIpodLocationBtn(wxCommandEvent& event)
wxLogVerbose("=== begin wxIpodLocationPage::OnIpodLocationBtn");
struct ipod_t ipod;
int n = ipod_scan(&ipod);
+ gv->curbootloader="";
- gv->curbootloader="bootloader-";
- gv->curbootloader.Append(ipod.targetname);
if(n == 0)
IpodLocationText->SetLabel("no Ipod found");
else if( n==1)
+ {
+ gv->curbootloader="bootloader-";
+ gv->curbootloader.Append(ipod.targetname);
IpodLocationText->SetLabel(ipod.modelstr);
+ }
else
IpodLocationText->SetLabel("More than 1 Ipod found");