Merge branch '0.10' into windows

OpenLightingProject · Jan 1, 2016 · 3dc6311 · 3dc6311
2 parents 5727305 + 5446726
commit 3dc6311
Show file tree

Hide file tree

Showing 4 changed files with 171 additions and 96 deletions.
diff --git a/plugins/artnet/ArtNetDevice.cpp b/plugins/artnet/ArtNetDevice.cpp
@@ -92,10 +92,9 @@ bool ArtNetDevice::StartHook() {
       ola::network::InterfacePicker::NewPicker());
   ola::network::InterfacePicker::Options options;
   options.include_loopback = m_preferences->GetValueAsBool(K_LOOPBACK_KEY);
-  if (!picker->ChooseInterface(
-          &iface,
-          m_preferences->GetValue(K_IP_KEY),
-          options)) {
+  if (!picker->ChooseInterface(&iface,
+                               m_preferences->GetValue(K_IP_KEY),
+                               options)) {
     OLA_INFO << "Failed to find an interface";
     return false;
   }