diff options
author | Uri Lublin <uril@redhat.com> | 2011-12-13 17:09:58 +0200 |
---|---|---|
committer | Uri Lublin <uril@redhat.com> | 2011-12-20 18:44:11 +0200 |
commit | fdcef173645e564be71f1b73d476c0716e91663d (patch) | |
tree | 7af76dfdbe4695dbc01a5af34580ce5ca666319d /client | |
parent | a91b0b3ff712eb2a7d91a951f2af7842495357c3 (diff) | |
download | spice-fdcef173645e564be71f1b73d476c0716e91663d.tar.gz spice-fdcef173645e564be71f1b73d476c0716e91663d.tar.xz spice-fdcef173645e564be71f1b73d476c0716e91663d.zip |
client: foreign-menu: pass "active" param when creating a ForeignMenu (#769020)
The default stays the same -- false.
A race could prevent setting ForeignMenu::_active correctly.
That happened when Application::on_app_activated was called before
_foriegn_menu was created. When foriegn_menu was created its
_active defaults to false, and that has not changed, until focus
was taken out and back in spice-client window.
This caused usbrdr to sometimes not auto-share devices, unless
the user switched focus to a different application and back to
spicec.
The fix updates ForiegnMenu::_active upon creation.
Diffstat (limited to 'client')
-rw-r--r-- | client/application.cpp | 2 | ||||
-rw-r--r-- | client/foreign_menu.cpp | 4 | ||||
-rw-r--r-- | client/foreign_menu.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/client/application.cpp b/client/application.cpp index decf8a19..e120dfe7 100644 --- a/client/application.cpp +++ b/client/application.cpp @@ -599,7 +599,7 @@ int Application::run() void Application::on_start_running() { - _foreign_menu.reset(new ForeignMenu(this)); + _foreign_menu.reset(new ForeignMenu(this, _active)); if (_enable_controller) { _controller.reset(new Controller(this)); return; diff --git a/client/foreign_menu.cpp b/client/foreign_menu.cpp index 00cc57ca..d1df49d0 100644 --- a/client/foreign_menu.cpp +++ b/client/foreign_menu.cpp @@ -36,9 +36,9 @@ #define PIPE_NAME "/tmp/SpiceForeignMenu-%lu.uds" #endif -ForeignMenu::ForeignMenu(ForeignMenuInterface *handler) +ForeignMenu::ForeignMenu(ForeignMenuInterface *handler, bool active) : _handler (handler) - , _active (false) + , _active (active) , _refs (1) { char pipe_name[PIPE_NAME_MAX_LEN]; diff --git a/client/foreign_menu.h b/client/foreign_menu.h index 2fc4e535..6138087a 100644 --- a/client/foreign_menu.h +++ b/client/foreign_menu.h @@ -38,7 +38,7 @@ public: class ForeignMenu : public NamedPipe::ListenerInterface { public: - ForeignMenu(ForeignMenuInterface *handler); + ForeignMenu(ForeignMenuInterface *handler, bool active = false); virtual ~ForeignMenu(); ForeignMenu* ref() { _refs++; return this;} |