Skip to content

Commit 2751d04

Browse files
authored
Always load proxy settings on startup (#187)
If proxy settings are provided externally (written to registry / plist), the client must load proxy settings on startup in order to apply them. Signed-off-by: Toomas Uudisaru <toomas.uudisaru@aktors.ee>
1 parent 5cca704 commit 2751d04

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

client/Application.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "QSigner.h"
2727
#include "DigiDoc.h"
2828
#include "dialogs/FirstRun.h"
29+
#include "dialogs/SettingsDialog.h"
2930
#include "dialogs/WaitDialog.h"
3031
#include "dialogs/WarningDialog.h"
3132

@@ -96,6 +97,7 @@ class DigidocConf: public digidoc::XmlConfCurrent
9697
reload();
9798
});
9899
s.beginGroup( "Client" );
100+
SettingsDialog::loadProxy(this);
99101
}
100102

101103
std::string proxyHost() const override

client/dialogs/SettingsDialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class SettingsDialog : public QDialog
4747
~SettingsDialog();
4848

4949
int exec() override;
50+
static void loadProxy( const digidoc::Conf *conf );
5051

5152
private Q_SLOTS:
5253
void save();
@@ -64,7 +65,6 @@ private Q_SLOTS:
6465
void selectLanguage();
6566
void setProxyEnabled();
6667
void updateProxy();
67-
void loadProxy( const digidoc::Conf *conf );
6868
void openDirectory();
6969
void updateDiagnostics();
7070
void saveDiagnostics();

0 commit comments

Comments
 (0)