repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ensure that the tray app only initialises once. bugzid: 2082
[deb_libcec.git]
/
src
/
LibCecTray
/
controller
/
CECController.cs
diff --git
a/src/LibCecTray/controller/CECController.cs
b/src/LibCecTray/controller/CECController.cs
index c1a6ed32e29c26411121a2686d0e8709d680488a..94fac2e4349e0bc4c76ecb83aab13f2ac6f8232e 100644
(file)
--- a/
src/LibCecTray/controller/CECController.cs
+++ b/
src/LibCecTray/controller/CECController.cs
@@
-203,6
+203,11
@@
namespace LibCECTray.controller
/// </summary>
public void Initialise()
{
/// </summary>
public void Initialise()
{
+ // only load once
+ if (_initialised)
+ return;
+ _initialised = true;
+
CECActions.ConnectToDevice(Config);
Applications.Initialise(this);
}
CECActions.ConnectToDevice(Config);
Applications.Initialise(this);
}
@@
-215,6
+220,7
@@
namespace LibCECTray.controller
Lib.DisableCallbacks();
Lib.StandbyDevices(CecLogicalAddress.Broadcast);
Lib.Close();
Lib.DisableCallbacks();
Lib.StandbyDevices(CecLogicalAddress.Broadcast);
Lib.Close();
+ _initialised = false;
}
/// <summary>
}
/// <summary>
@@
-519,6
+525,7
@@
namespace LibCECTray.controller
private readonly CECTray _gui;
public Actions CECActions;
private bool _deviceChangeWarningDisplayed;
private readonly CECTray _gui;
public Actions CECActions;
private bool _deviceChangeWarningDisplayed;
+ private bool _initialised;
#endregion
}
#endregion
}