From bbd85cf0c1b3fb14d46216ed7a5bc79a70375567 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Sun, 7 Mar 2021 18:11:13 -0500
Subject: settings: Fix inconsistent #ifdefs wrapping the usb_mode stuff

It should be:

 #if defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR)

Change-Id: I49355d56834de3893a9a244793b39f662c27f136
---
 apps/menus/settings_menu.c | 2 +-
 apps/settings.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'apps')

diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index f8dbb86dc3..a28b568da1 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -449,7 +449,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
 #if defined(DX50) || defined(DX90)
             &governor,
 #endif
-#ifdef HAVE_USB_POWER
+#if defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR)
             &usb_mode,
 #endif
          );
diff --git a/apps/settings.h b/apps/settings.h
index e6af373e15..728e10bf30 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -824,7 +824,7 @@ struct user_settings
 #if defined(DX50) || defined(DX90)
     int governor;
 #endif
-#ifdef HAVE_USB_POWER
+#if defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR)
     int usb_mode;
 #endif
 };
-- 
cgit v1.2.3