diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-02-06 17:21:41 +0000 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-02-06 20:41:02 +0100 |
| commit | 1ff566f4887ae0ddf99159f8f035e9b91a67643d (patch) | |
| tree | 67657584298bd0d34d19f091026fca5a4c177811 | |
| parent | 478508a2410f1bff94af8ee9dfb1ea1e65cac09c (diff) | |
fdo#58699 - sdremote - fix it so it closes even with no bluetooth.
Change-Id: I09588f4e4b22466843f855d99c06f616c04518ac
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
| -rw-r--r-- | sd/source/ui/dlg/RemoteDialog.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index 97b1f3cf6f42..fd6089570a98 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -27,9 +27,10 @@ RemoteDialog::RemoteDialog( Window *pWindow ) : { (void) mPreviouslyDiscoverable; // avoid warnings about unused member -#ifdef ENABLE_SDREMOTE FreeResource(); +#ifdef ENABLE_SDREMOTE + #ifdef ENABLE_SDREMOTE_BLUETOOTH mPreviouslyDiscoverable = RemoteServer::isBluetoothDiscoverable(); if ( !mPreviouslyDiscoverable ) @@ -45,11 +46,11 @@ RemoteDialog::RemoteDialog( Window *pWindow ) : { mClientBox.addEntry( *aIt ); } +#endif mButtonConnect.SetClickHdl( LINK( this, RemoteDialog, HandleConnectButton ) ); SetCloseHdl( LINK( this, RemoteDialog, CloseHdl ) ); mButtonCancel.SetClickHdl( LINK( this, RemoteDialog, CloseHdl ) ); -#endif } RemoteDialog::~RemoteDialog() @@ -84,8 +85,8 @@ IMPL_LINK_NOARG( RemoteDialog, CloseHdl ) { RemoteServer::setBluetoothDiscoverable( false ); } - Close(); #endif + Close(); return 0; } |