settings: remove Restart as a user button in an elevated context (#1328)

microsoft · Feb 19, 2020 · e21f832 · e21f832
1 parent 27f0782
commit e21f832
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/settings-web/src/components/GeneralSettings.tsx b/src/settings-web/src/components/GeneralSettings.tsx
@@ -140,16 +140,12 @@ export class GeneralSettings extends React.Component <any, any> {
           ref={(input) => {this.elevated_reference=input;}}
         />)
         }
-        {this.state.settings.general.is_admin &&
+        {this.state.settings.general.is_admin && !this.state.settings.general.is_elevated &&
         (<CustomActionSettingsControl
           setting={{
             display_name: '',
-            value: this.state.settings.general.is_elevated ? 
-                   'Running as administrator. Do you wish to run as user instead?' :
-                   'Running as user. Do you wish to run as administrator instead?',
-            button_text: this.state.settings.general.is_elevated ? 
-                          'Restart as user' :
-                          'Restart as administrator'
+            value: 'Running as user. Do you wish to run as administrator instead?',
+            button_text: 'Restart as administrator'
           }}
           action_name={'restart_elevation'}
           action_callback={(action_name: any, value:any) => {

diff --git a/src/settings/settings-html/dist/bundle.js b/src/settings/settings-html/dist/bundle.js