Prevent going back when no servers are added

jellyfin · Jun 25, 2020 · 543e1cd · 543e1cd
1 parent 209e48e
commit 543e1cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/components/ServerInput.js b/components/ServerInput.js
@@ -77,13 +77,13 @@ class ServerInput extends React.Component {
  this.props.onSuccess();
  }
  // Navigate to the main screen
- this.props.navigation.reset({
- index: 0,
- routes: [{
- name: this.props.successScreen || 'Main',
- props: { activeServer: servers.length - 1 }
- }]
- });
+ this.props.navigation.replace(
+ 'Main',
+ {
+ screen: this.props.successScreen || 'Home',
+ params: { activeServer: servers.length - 1 }
+ }
+ );
  } else {
  this.setState({
  isValid: false,

diff --git a/screens/SettingsScreen.js b/screens/SettingsScreen.js
@@ -176,7 +176,7 @@ class SettingsScreen extends React.Component {
  this.props.navigation.navigate('Home', { activeServer: 0 });
  } else {
  // No servers are present, navigate to add server screen
- this.props.navigation.navigate('AddServer');
+ this.props.navigation.replace('AddServer');
  }
  }
 
@@ -186,7 +186,7 @@ class SettingsScreen extends React.Component {
  // Reset the storage cache
  CachingStorage.instance = null;
  // Navigate to the loading screen
- this.props.navigation.navigate('AddServer');
+ this.props.navigation.replace('AddServer');
  }
 
  onDeleteServer(index) {