Skip to content

Commit 0e0d594

Browse files
committed
if a linux opener is enetered but config not saved, and opener
window is opened again, display the one entered instead of the saved opener
1 parent bb84818 commit 0e0d594

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

pyradio/radio.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,14 @@ def __init__(self, pyradio_config,
752752
lambda: self.ws.previous_operation_mode
753753
)
754754

755+
''' keep resource opener from Opener Selection window.
756+
This way, reopening the Opener Seletion window
757+
while on Config Window, before saving the configuration
758+
file, will show the opener previously entered,
759+
instead of the saved one
760+
'''
761+
self._tmp_resource_opener = self._cnf.resource_opener
762+
755763
def __del__(self):
756764
self.transientWin = None
757765

@@ -5544,7 +5552,7 @@ def _open_redordings_dir_select_win(self):
55445552
def _open_resource_opener_select_win(self):
55455553
if self._insert_resource_opener_win is None:
55465554
self._insert_resource_opener_win = PyRadioResourceOpener(
5547-
opener=self._cnf.resource_opener,
5555+
opener=self._tmp_resource_opener,
55485556
parent=self.outerBodyWin,
55495557
global_functions=self._global_functions,
55505558
)
@@ -6746,6 +6754,10 @@ def keypress(self, char):
67466754
self._station_select_win = None
67476755
self._browser_config_win = None
67486756
ret, ret_list = self._config_win.keypress(char)
6757+
# logger.error('\n\n')
6758+
# logger.error(f'{ret = }')
6759+
# logger.error(f'{ret_list = }')
6760+
# logger.error('\n\n')
67496761
if ret == self.ws.INSERT_RECORDINGS_DIR_MODE:
67506762
self._open_redordings_dir_select_win()
67516763
elif ret == self.ws.INSERT_RESOURCE_OPENER:
@@ -6984,6 +6996,9 @@ def keypress(self, char):
69846996
self._config_win._saved_config_options['dirty_config'][1] = False
69856997
self._cnf.dirty_config = False
69866998
''' clean up '''
6999+
if ret == 1:
7000+
''' canceled '''
7001+
self._tmp_resource_opener = self._cnf.resource_opener
69877002
self._player_select_win = None
69887003
self._encoding_select_win = None
69897004
self._playlist_select_win = None
@@ -7311,6 +7326,7 @@ def keypress(self, char):
73117326
# logger.error('\nret\t\t{0}\nnew_dir\t\t"{1}"\nMove dir\t{2}'.format(ret, new_dir, self._asked_to_move_recordings_dir))
73127327
# logger.error('\nRecordings Directory Selected\n\n')
73137328
self._config_win._config_options['resource_opener'][1] = new_opener
7329+
self._tmp_resource_opener = new_opener
73147330
# logger.info('\n self._config_win._config_options : "{}"'.format(self._config_win._config_options['recording_dir'][1]))
73157331
# logger.info('\n self._config_win._saved_config_options : "{}"'.format(self._config_win._saved_config_options['recording_dir'][1]))
73167332
# logger.info('\n self.xdg._new_dirs[RECORDINGS] : "{}"'.format(self._cnf.xdg._new_dirs[self._cnf.xdg.RECORDINGS]))

0 commit comments

Comments
 (0)