diff options
| author | Jonas Schnelli <[email protected]> | 2016-01-08 11:03:52 +0100 |
|---|---|---|
| committer | Jonas Schnelli <[email protected]> | 2016-01-08 11:18:28 +0100 |
| commit | 8a7f0001be88122256b1a8dc29b066210dc85625 (patch) | |
| tree | 02d35c01a5d68c8aa54662cbf0f0acec0681f1f2 /src/qt | |
| parent | Fix RPCTimerInterface ordering issue (diff) | |
| download | discoin-8a7f0001be88122256b1a8dc29b066210dc85625.tar.xz discoin-8a7f0001be88122256b1a8dc29b066210dc85625.zip | |
[RPC] remove the option of having multiple timer interfaces
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/rpcconsole.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 4c869b9ac..7178bc00e 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -278,7 +278,9 @@ RPCConsole::RPCConsole(const PlatformStyle *platformStyle, QWidget *parent) : #endif // Register RPC timer interface rpcTimerInterface = new QtRPCTimerInterface(); - RPCRegisterTimerInterface(rpcTimerInterface); + // avoid accidentally overwriting an existing, non QTThread + // based timer interface + RPCSetTimerInterfaceIfUnset(rpcTimerInterface); startExecutor(); setTrafficGraphRange(INITIAL_TRAFFIC_GRAPH_MINS); @@ -293,7 +295,7 @@ RPCConsole::~RPCConsole() { GUIUtil::saveWindowGeometry("nRPCConsoleWindow", this); Q_EMIT stopExecutor(); - RPCUnregisterTimerInterface(rpcTimerInterface); + RPCUnsetTimerInterface(rpcTimerInterface); delete rpcTimerInterface; delete ui; } |