From f231c548862f8b0cf8de7591166e9ba860e05581 Mon Sep 17 00:00:00 2001
From: Mathias Rasmussen <mathiasvr@gmail.com>
Date: Fri, 28 Sep 2018 17:10:21 +0200
Subject: [PATCH 1/2] clean up preferences-page

---
 src/renderer/components/path-selector.js |  6 ++++--
 src/renderer/pages/preferences-page.js   | 10 ++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/renderer/components/path-selector.js b/src/renderer/components/path-selector.js
index 51c89430..3c5d7c19 100644
--- a/src/renderer/components/path-selector.js
+++ b/src/renderer/components/path-selector.js
@@ -1,3 +1,5 @@
+const path = require('path')
+
 const colors = require('material-ui/styles/colors')
 const electron = require('electron')
 const React = require('react')
@@ -31,8 +33,8 @@ class PathSelector extends React.Component {
 
   handleClick () {
     const opts = Object.assign({
-      defaultPath: this.props.value,
-      properties: ['openFile', 'openDirectory']
+      defaultPath: this.props.value && path.dirname(this.props.value),
+      properties: [ 'openFile', 'openDirectory' ]
     }, this.props.dialog)
 
     remote.dialog.showOpenDialog(
diff --git a/src/renderer/pages/preferences-page.js b/src/renderer/pages/preferences-page.js
index 037dd382..04fd94c7 100644
--- a/src/renderer/pages/preferences-page.js
+++ b/src/renderer/pages/preferences-page.js
@@ -1,4 +1,3 @@
-const path = require('path')
 const React = require('react')
 const PropTypes = require('prop-types')
 
@@ -105,7 +104,7 @@ class PreferencesPage extends React.Component {
           displayValue={playerName}
           onChange={this.handleExternalPlayerPathChange}
           title='External player'
-          value={playerPath ? path.dirname(playerPath) : null}
+          value={playerPath}
         />
       </Preference>
     )
@@ -139,11 +138,11 @@ class PreferencesPage extends React.Component {
     dispatch('updatePreferences', 'autoAddTorrents', isChecked)
 
     if (isChecked) {
-      dispatch('startFolderWatcher', null)
+      dispatch('startFolderWatcher')
       return
     }
 
-    dispatch('stopFolderWatcher', null)
+    dispatch('stopFolderWatcher')
   }
 
   torrentsFolderPathSelector () {
@@ -156,10 +155,9 @@ class PreferencesPage extends React.Component {
             title: 'Select folder to watch for new torrents',
             properties: ['openDirectory']
           }}
-          displayValue={torrentsFolderPath || ''}
           onChange={this.handleTorrentsFolderPathChange}
           title='Folder to watch'
-          value={torrentsFolderPath ? path.dirname(torrentsFolderPath) : null}
+          value={torrentsFolderPath}
         />
       </Preference>
     )

From f34a79df3631e9072430cb27e566e7eb2cad20f6 Mon Sep 17 00:00:00 2001
From: Mathias Rasmussen <mathiasvr@gmail.com>
Date: Fri, 28 Sep 2018 17:13:35 +0200
Subject: [PATCH 2/2] path-selector: display path instead of name

---
 src/renderer/components/path-selector.js | 6 ++----
 src/renderer/pages/preferences-page.js   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/renderer/components/path-selector.js b/src/renderer/components/path-selector.js
index 3c5d7c19..3be07d70 100644
--- a/src/renderer/components/path-selector.js
+++ b/src/renderer/components/path-selector.js
@@ -18,7 +18,6 @@ class PathSelector extends React.Component {
     return {
       className: PropTypes.string,
       dialog: PropTypes.object,
-      displayValue: PropTypes.string,
       id: PropTypes.string,
       onChange: PropTypes.func,
       title: PropTypes.string.isRequired,
@@ -34,7 +33,7 @@ class PathSelector extends React.Component {
   handleClick () {
     const opts = Object.assign({
       defaultPath: this.props.value && path.dirname(this.props.value),
-      properties: [ 'openFile', 'openDirectory' ]
+      properties: ['openFile', 'openDirectory']
     }, this.props.dialog)
 
     remote.dialog.showOpenDialog(
@@ -67,8 +66,7 @@ class PathSelector extends React.Component {
     const textFieldStyle = {
       flex: '1'
     }
-
-    const text = this.props.displayValue || this.props.value || ''
+    const text = this.props.value || ''
     const buttonStyle = {
       marginLeft: 10
     }
diff --git a/src/renderer/pages/preferences-page.js b/src/renderer/pages/preferences-page.js
index 04fd94c7..359b6786 100644
--- a/src/renderer/pages/preferences-page.js
+++ b/src/renderer/pages/preferences-page.js
@@ -101,7 +101,6 @@ class PreferencesPage extends React.Component {
             title: 'Select media player app',
             properties: ['openFile']
           }}
-          displayValue={playerName}
           onChange={this.handleExternalPlayerPathChange}
           title='External player'
           value={playerPath}