len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-14 07:32:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- fix an endless autodetection loop when no user configuration is present

Browse source 
- don't try to load the manual if a proxy is set -- wx' html view doesn't honor the proxy


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13914 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2007-07-16 10:18:20 +00:00
parent ad9db0c145
commit 7564ad8efa
2 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

40
rbutil/rbutilFrm.cpp
View file

@ -341,7 +341,19 @@ void rbutilFrm::OnManualUpdate(wxUpdateUIEvent& event)
{ {
wxString tmp = wxT("/rockbox-") + gv->curplat; wxString tmp = wxT("/rockbox-") + gv->curplat;
int index = GetDeviceId(); int index = GetDeviceId(false);
if(index < 0) {
curManualDevice = tmp;
wxString pdflink;
pdflink = gv->manual_url;
manuallink->SetURL(pdflink);
manual->SetPage(wxT("<p><b>no device selected</b> &mdash; "
"You can find an overview of available manuals at "
"<a href='http://www.rockbox.org/manual.shtml'>"
"http://www.rockbox.org/manual.shtml</a></p>"));
return;
}
if(gv->plat_manualname[index] != wxT("")) if(gv->plat_manualname[index] != wxT(""))
tmp = wxT("/") + gv->plat_manualname[index]; tmp = wxT("/") + gv->plat_manualname[index];
@ -358,8 +370,10 @@ void rbutilFrm::OnManualUpdate(wxUpdateUIEvent& event)
// construct link to html // construct link to html
wxString htmllink; wxString htmllink;
htmllink = gv->manual_url + tmp + wxT("/rockbox-build.html"); htmllink = gv->manual_url + tmp + wxT("/rockbox-build.html");
if(!manual->LoadPage(htmllink)) if(gv->proxy_url == wxT(""))
manual->SetPage(wxT("<p>unable to display manual -- please use the PDF link above</p>")); if(manual->LoadPage(htmllink)) return;
manual->SetPage(wxT("<p>unable to display manual &mdash;"
"please use the PDF link above</p>"));
} }
@ -456,7 +470,7 @@ void rbutilFrm::OnBootloaderRemoveBtn(wxCommandEvent& event)
{ {
wxLogVerbose(wxT("=== begin rbutilFrm::OnBootloaderRemoveBtn(event)")); wxLogVerbose(wxT("=== begin rbutilFrm::OnBootloaderRemoveBtn(event)"));
int index = GetDeviceId(); int index = GetDeviceId(true);
if(index < 0) if(index < 0)
return; return;
@ -541,7 +555,7 @@ void rbutilFrm::OnBootloaderBtn(wxCommandEvent& event)
{ {
wxLogVerbose(wxT("=== begin rbutilFrm::OnBootloaderBtn(event)")); wxLogVerbose(wxT("=== begin rbutilFrm::OnBootloaderBtn(event)"));
int index = GetDeviceId(); int index = GetDeviceId(true);
if(index < 0) if(index < 0)
return; return;
@ -654,7 +668,7 @@ void rbutilFrm::OnInstallBtn(wxCommandEvent& event)
wxFileConfig* buildinfo; wxFileConfig* buildinfo;
wxDateSpan oneday; wxDateSpan oneday;
int index = GetDeviceId(); int index = GetDeviceId(true);
if(index < 0) if(index < 0)
return; return;
@ -766,7 +780,7 @@ void rbutilFrm::OnFontBtn(wxCommandEvent& event)
wxFileConfig* buildinfo; wxFileConfig* buildinfo;
wxDateSpan oneday; wxDateSpan oneday;
int index = GetDeviceId(); int index = GetDeviceId(true);
if(index < 0) if(index < 0)
return; return;
@ -855,7 +869,7 @@ void rbutilFrm::OnDoomBtn(wxCommandEvent& event)
wxString src, dest, buf; wxString src, dest, buf;
wxLogVerbose(wxT("=== begin rbutilFrm::OnDoomBtn(event)")); wxLogVerbose(wxT("=== begin rbutilFrm::OnDoomBtn(event)"));
int index = GetDeviceId(); int index = GetDeviceId(true);
if(index < 0) if(index < 0)
return; return;
@ -917,7 +931,7 @@ void rbutilFrm::OnThemesBtn(wxCommandEvent& event)
wxString src, dest, buf; wxString src, dest, buf;
wxLogVerbose(wxT("=== begin rbutilFrm::OnThemesBtn(event)")); wxLogVerbose(wxT("=== begin rbutilFrm::OnThemesBtn(event)"));
int index = GetDeviceId(); int index = GetDeviceId(true);
if(index < 0) if(index < 0)
return; return;
@ -956,7 +970,7 @@ void rbutilFrm::OnRemoveBtn(wxCommandEvent& event)
{ {
wxLogVerbose(wxT("=== begin rbutilFrm::OnRemoveBtn(event)")); wxLogVerbose(wxT("=== begin rbutilFrm::OnRemoveBtn(event)"));
int index = GetDeviceId(); int index = GetDeviceId(true);
if(index < 0) if(index < 0)
return; return;
@ -995,7 +1009,7 @@ void rbutilFrm::OnPortableInstall(wxCommandEvent& event)
wxFileSystem fs; wxFileSystem fs;
wxDateSpan oneday; wxDateSpan oneday;
int index = GetDeviceId(); int index = GetDeviceId(true);
if(index < 0) if(index < 0)
return; return;
@ -1050,10 +1064,10 @@ void rbutilFrm::OnTalkBtn(wxCommandEvent& event)
wxLogVerbose(wxT("=== end rbutilFrm::OnTalkBtn")); wxLogVerbose(wxT("=== end rbutilFrm::OnTalkBtn"));
} }
int rbutilFrm::GetDeviceId() int rbutilFrm::GetDeviceId(bool detect)
{ {
int index = gv->plat_id.Index(gv->curplat); int index = gv->plat_id.Index(gv->curplat);
if(index < 0) if(index < 0 && detect)
{ {
if( wxMessageBox(wxT("No device selected. Do you want to autodetect " if( wxMessageBox(wxT("No device selected. Do you want to autodetect "
"the device?"), "the device?"),

2
rbutil/rbutilFrm.h
View file

@ -124,7 +124,7 @@ public:
void OnDoomBtn(wxCommandEvent& event); void OnDoomBtn(wxCommandEvent& event);
void OnTalkBtn(wxCommandEvent& event); void OnTalkBtn(wxCommandEvent& event);
int GetDeviceId(); int GetDeviceId(bool);
}; };