mirrors/urbackup_frontend_wx
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_frontend_wx.git synced 2025-10-26 11:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow reopening if there is an error when opening status page

Browse Source
This commit is contained in:
Martin 2016-01-14 01:19:50 +01:00
parent f13dd496a3
commit 02bccfcc8b
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Status.cpp
View File

@ -25,7 +25,7 @@ extern wxString res_path;
extern wxString ico_ext;
extern wxBitmapType ico_type;
const int reset_error_count=60;
const int reset_error_count=20;
namespace
{
@ -120,6 +120,11 @@ Status::Status(wxWindow* parent, wxLongLong_t follow_only_process_id)
Show(true);
RequestUserAttention();
if (follow_only_process_id == 0)
{
instance = this;
}
Start(1000);
}
@ -128,11 +133,6 @@ Status::Status(wxWindow* parent, wxLongLong_t follow_only_process_id)
#endif
error_count=reset_error_count;
if (follow_only_process_id == 0)
{
instance = this;
}
}
@ -147,7 +147,6 @@ bool Status::updateStatus(int errcnt)
{
Stop();
wxMessageBox(_("There was an error. Currently nothing can be backed up."), wxT("UrBackup"), wxOK|wxICON_ERROR);
Hide();
Close();
}
return false;

2
urbackup.wxs
View File

@ -5,7 +5,7 @@
Version='$version_full_numeric$' Manufacturer='Martin Raiber' UpgradeCode='87d7bb18-2091-4876-a8de-0c47f7d2e052'>
<Package Description='Client for UrBackup Server'
Comments='Client for UrBackup Server. Allows file and image backups'
Manufacturer='Martin Raiber' InstallerVersion='300' Compressed='yes' Platform='$(var.Platform)'/>
Manufacturer='Martin Raiber' InstallerVersion='301' Compressed='yes' Platform='$(var.Platform)'/>
<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />

2
urbackup_notray.wxs
View File

@ -5,7 +5,7 @@
Version='$version_full_numeric$' Manufacturer='Martin Raiber' UpgradeCode='87d7bb18-2091-4876-a8de-0c47f7d2e052'>
<Package Description='Client for UrBackup Server'
Comments='Client for UrBackup Server. Allows file and image backups'
Manufacturer='Martin Raiber' InstallerVersion='300' Compressed='yes' Platform='$(var.Platform)'/>
Manufacturer='Martin Raiber' InstallerVersion='301' Compressed='yes' Platform='$(var.Platform)'/>
<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />