devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix bug with ipod bootloader installation, found by linuxstb

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12440 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2007-02-21 21:44:56 +00:00
parent e863d595b5
commit 1df59e1a09
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rbutil/wizard_pages.cpp
View file

@ -148,8 +148,8 @@ wxIpodLocationPage::wxIpodLocationPage(wxWizard* parent) : wxWizardPageSimple(pa
// Header text // Header text
IpodLocationLabel = new wxStaticText(this, wxID_ANY, IpodLocationLabel = new wxStaticText(this, wxID_ANY,
wxT("Rockbox utility needs to know the device where your ipod\n" wxT("Rockbox utility needs to know the device where your ipod\n"
"device is located on your computer. Rockbox utility\n" "device is located on your computer. Use the\n"
"has detected the following location:")); "Scan Button:"));
WxBoxSizer1->Add(IpodLocationLabel,0,wxGROW | wxALL, 5); WxBoxSizer1->Add(IpodLocationLabel,0,wxGROW | wxALL, 5);
// device location // device location
@ -208,13 +208,16 @@ void wxIpodLocationPage::OnIpodLocationBtn(wxCommandEvent& event)
wxLogVerbose("=== begin wxIpodLocationPage::OnIpodLocationBtn"); wxLogVerbose("=== begin wxIpodLocationPage::OnIpodLocationBtn");
struct ipod_t ipod; struct ipod_t ipod;
int n = ipod_scan(&ipod); int n = ipod_scan(&ipod);
gv->curbootloader="";
gv->curbootloader="bootloader-";
gv->curbootloader.Append(ipod.targetname);
if(n == 0) if(n == 0)
IpodLocationText->SetLabel("no Ipod found"); IpodLocationText->SetLabel("no Ipod found");
else if( n==1) else if( n==1)
{
gv->curbootloader="bootloader-";
gv->curbootloader.Append(ipod.targetname);
IpodLocationText->SetLabel(ipod.modelstr); IpodLocationText->SetLabel(ipod.modelstr);
}
else else
IpodLocationText->SetLabel("More than 1 Ipod found"); IpodLocationText->SetLabel("More than 1 Ipod found");