Revision 855fc9c9

b/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
643 643
    if not exist "$(TargetDir)amd64" md "$(TargetDir)amd64"
644 644
    xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8876.1\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"
645 645

  
646
    xcopy /s /y "$(SolutionDir)Libraries\OpenSSL\$(PlatformName)\*.*" "$(TargetDir)"
646
    if %25PROCESSOR_ARCHITECTURE%25 == "AMD64" xcopy /s /y "$(SolutionDir)Libraries\OpenSSL\x64\*.*" "$(TargetDir)"
647
    if %25PROCESSOR_ARCHITECTURE%25 == "X86" xcopy /s /y "$(SolutionDir)Libraries\OpenSSL\x86\*.*" "$(TargetDir)"
648

  
649

  
647 650
    xcopy /s /y "$(SolutionDir)Libraries\OpenSSL\x86\*.*" "$(TargetDir)x86"
648 651
    xcopy /s /y "$(SolutionDir)Libraries\OpenSSL\x64\*.*" "$(TargetDir)amd64"
649 652

  
b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
396 396
                if (!Directory.Exists(account.RootPath))
397 397
                {
398 398
                    account.IsActive = false;
399
                    Settings.Save();
399 400
                    Notify(new Notification
400 401
                    {
401 402
                        Level = TraceLevel.Error,
b/trunk/Pithos.Core/Agents/NetworkAgent.cs
126 126
        private readonly AsyncManualResetEvent _unPauseEvent = new AsyncManualResetEvent(true);
127 127

  
128 128

  
129
        private bool _canCheckConnectivity=true;
130

  
129 131
        public bool IsConnectedToInternet
130 132
        {
131
            get {
132
                return !MS.WindowsAPICodePack.Internal.CoreHelpers.RunningOnVista 
133
                    || Microsoft.WindowsAPICodePack.Net.NetworkListManager.IsConnectedToInternet;
133
            get
134
            {
135
                if (!_canCheckConnectivity)
136
                    return true;
137
                try
138
                {
139
                    _canCheckConnectivity = MS.WindowsAPICodePack.Internal.CoreHelpers.RunningOnVista;
140
                    return !_canCheckConnectivity
141
                           || Microsoft.WindowsAPICodePack.Net.NetworkListManager.IsConnectedToInternet;
142
                }
143
                catch (Exception exc)
144
                {
145
                    Log.ErrorFormat("Code error while trying to determine connectivity: [{0}]", exc);
146
                    //If the check fails, short-circuit it and don't retry
147
                    _canCheckConnectivity = false;
148
                    return true;
149
                }
134 150
            }
135 151
        }
152

  
136 153
/*
137 154
        private CancellationTokenSource _currentOperationCancellation=new CancellationTokenSource();
138 155
*/
b/trunk/Pithos.Network/WebExtensions.cs
301 301

  
302 302
                //Wait for service unavailable
303 303
                if (resultStatus == HttpStatusCode.ServiceUnavailable ||
304
                    resultStatus == HttpStatusCode.BadGateway)
304
                    resultStatus == HttpStatusCode.BadGateway ||
305
                    resultStatus == HttpStatusCode.InternalServerError )
305 306
                {
306 307

  
307 308
                    Log.WarnFormat("[UNAVAILABLE] Waiting before retrying [{0}]:[{1}] due to [{2}]", msg.Method,

Also available in: Unified diff