diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-02-06 17:21:41 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-02-06 17:45:37 +0000 |
| commit | 535dd86dfa4fbe0f2555205cb925586176267800 (patch) | |
| tree | d2a8fc8b2f2c4beb43d22d875efd32b7cc9f9a40 /sd | |
| parent | also change the font combo tooltip to say font is not available (diff) | |
| download | core-535dd86dfa4fbe0f2555205cb925586176267800.tar.gz core-535dd86dfa4fbe0f2555205cb925586176267800.zip | |
fdo#58699 - sdremote - fix it so it closes even with no bluetooth.
Change-Id: I09588f4e4b22466843f855d99c06f616c04518ac
Diffstat (limited to 'sd')
| -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 b41db5e76486..d98eda7e3827 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() @@ -87,8 +88,8 @@ IMPL_LINK_NOARG( RemoteDialog, CloseHdl ) { RemoteServer::setBluetoothDiscoverable( false ); } - Close(); #endif + Close(); return 0; } |