rbutil: attempt autodetection at startup.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13702 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 7 insertions, 6 deletions

diff --git a/rbutil/rbutilApp.cpp b/rbutil/rbutilApp.cpp
index 3bc5d59..f3de467 100644
--- a/rbutil/rbutilApp.cpp
+++ b/rbutil/rbutilApp.cpp
@@ -79,15 +79,14 @@ bool rbutilFrmApp::OnInit()
     ReadUserConfig();
 
     wxInitAllImageHandlers();       //init Image handlers
+    initIpodpatcher();             // reserve mem for ipodpatcher
+    initSansaPatcher();            // reserve mem for sansapatcher
 
     rbutilFrm *myFrame = new  rbutilFrm(NULL);
     SetTopWindow(myFrame);
 
     myFrame->Show(TRUE);
 
-    initIpodpatcher();             // reserve mem for ipodpatcher
-    initSansaPatcher();            // reserve mem for sansapatcher
-
     wxLogVerbose(wxT("=== end rbUtilFrmApp::OnInit()"));
     return TRUE;
 }
diff --git a/rbutil/rbutilCtrls.cpp b/rbutil/rbutilCtrls.cpp
index 441d046..baa8bc8 100644
--- a/rbutil/rbutilCtrls.cpp
+++ b/rbutil/rbutilCtrls.cpp
@@ -463,7 +463,7 @@ void DeviceSelectorCtrl::AutoDetect()
     }
     else
     {
-        WARN_DIALOG(wxT("No Device detected. (This function only works if you have already installed rockbox or if you use a ipod or a sansa)."),
+        WARN_DIALOG(wxT("No Device detected. If you have a Device connected, select the correct one manually."),
                 wxT("Detecting a Device"));
         return;
     }
diff --git a/rbutil/rbutilFrm.cpp b/rbutil/rbutilFrm.cpp
index 8654dd0..9b4a19b 100644
--- a/rbutil/rbutilFrm.cpp
+++ b/rbutil/rbutilFrm.cpp
@@ -76,9 +76,9 @@ rbutilFrm::~rbutilFrm() {}
 
 void rbutilFrm::CreateGUIControls(void)
 {
-   wxLogVerbose(wxT("=== begin rbutilFrm::CreateGUIControls()"));
+    wxLogVerbose(wxT("=== begin rbutilFrm::CreateGUIControls()"));
 
-	wxBoxSizer* WxBoxSizer1 = new wxBoxSizer(wxVERTICAL);
+  	wxBoxSizer* WxBoxSizer1 = new wxBoxSizer(wxVERTICAL);
 	this->SetSizer(WxBoxSizer1);
 	this->SetAutoLayout(TRUE);
 
@@ -96,8 +96,10 @@ void rbutilFrm::CreateGUIControls(void)
 
 	myDeviceSelector = new DeviceSelectorCtrl(mainPanel,wxID_ANY);
 	myDeviceSelector->setDefault();
+	myDeviceSelector->AutoDetect();
 	WxBoxSizer0->Add(myDeviceSelector,0,wxGROW|wxALL,5);
 
+
     wxNotebook* tabwindow = new wxNotebook(mainPanel,wxID_ANY);
     WxBoxSizer0->Add(tabwindow,1,wxGROW|wxALL,5);