From f8fe8393ddfce102de12e9fa07916bb7924b8b31 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Mar 2015 17:26:56 -0700 Subject: [PATCH] store discoverability mode as an int --- interface/src/DiscoverabilityManager.cpp | 6 +++--- interface/src/DiscoverabilityManager.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/src/DiscoverabilityManager.cpp b/interface/src/DiscoverabilityManager.cpp index 7dca8c399a..0d0139e1db 100644 --- a/interface/src/DiscoverabilityManager.cpp +++ b/interface/src/DiscoverabilityManager.cpp @@ -75,12 +75,12 @@ void DiscoverabilityManager::removeLocation() { } void DiscoverabilityManager::setDiscoverabilityMode(Discoverability::Mode discoverabilityMode) { - if (_mode.get() != discoverabilityMode) { + if (static_cast(_mode.get()) != discoverabilityMode) { // update the setting to the new value - _mode.set(discoverabilityMode); + _mode.set(static_cast(discoverabilityMode)); - if (_mode.get() == Discoverability::None) { + if (static_cast(_mode.get()) == Discoverability::None) { // if we just got set to no discoverability, make sure that we delete our location in DB removeLocation(); } diff --git a/interface/src/DiscoverabilityManager.h b/interface/src/DiscoverabilityManager.h index 6d9f912928..1dac7d63eb 100644 --- a/interface/src/DiscoverabilityManager.h +++ b/interface/src/DiscoverabilityManager.h @@ -33,13 +33,13 @@ public slots: void updateLocation(); void removeLocation(); - Discoverability::Mode getDiscoverabilityMode() { return _mode.get(); } + Discoverability::Mode getDiscoverabilityMode() { return static_cast(_mode.get()); } void setDiscoverabilityMode(Discoverability::Mode discoverabilityMode); private: DiscoverabilityManager(); - Setting::Handle _mode; + Setting::Handle _mode; }; #endif // hifi_DiscoverabilityManager_h \ No newline at end of file