diff --git a/setup/builds/RestoreSettings.bat b/setup/builds/RestoreSettings.bat deleted file mode 100644 index f46082ea7a..0000000000 --- a/setup/builds/RestoreSettings.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -rem This batch file restores Shareaza settings from previously saved -rem file ShareazaSave.reg to the registry - -if not exist ShareazaSave.reg exit - -echo REGEDIT4> "%TEMP%\ShareazaDelOld.reg" -echo [-HKEY_CURRENT_USER\Software\Shareaza]>> "%TEMP%\ShareazaDelOld.reg" - -start/wait regedit -s "%TEMP%\ShareazaDelOld.reg" -del "%TEMP%\ShareazaDelOld.reg" > nul - -:import -start/wait regedit -s ShareazaSave.reg \ No newline at end of file diff --git a/setup/builds/SaveSettings.bat b/setup/builds/SaveSettings.bat deleted file mode 100644 index 6578673a64..0000000000 --- a/setup/builds/SaveSettings.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -rem This batch file saves Shareaza settings from the registry -rem to file ShareazaSave.reg - -regedit /ea ShareazaSave.reg HKEY_CURRENT_USER\Software\Shareaza \ No newline at end of file diff --git a/shareaza/Network.cpp b/shareaza/Network.cpp index 0d6e7307e6..a2461ce524 100644 --- a/shareaza/Network.cpp +++ b/shareaza/Network.cpp @@ -719,13 +719,13 @@ bool CNetwork::PreRun() InternetSetOption( hInternet, INTERNET_OPTION_CONNECTED_STATE, &ici, sizeof(ici) ); InternetCloseHandle( hInternet ); } -/* - if ( ! InternetConnect() ) + + if ( ! CNInternetConnect() ) { theApp.Message( MSG_ERROR, _T("Internet connection attempt failed.") ); return false; } -*/ + m_bConnected = true; Resolve( Settings.Connection.InHost, Settings.Connection.InPort, &m_pHost );