@@ -752,6 +752,14 @@ def __init__(self, pyradio_config,
752
752
lambda : self .ws .previous_operation_mode
753
753
)
754
754
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
+
755
763
def __del__ (self ):
756
764
self .transientWin = None
757
765
@@ -5544,7 +5552,7 @@ def _open_redordings_dir_select_win(self):
5544
5552
def _open_resource_opener_select_win (self ):
5545
5553
if self ._insert_resource_opener_win is None :
5546
5554
self ._insert_resource_opener_win = PyRadioResourceOpener (
5547
- opener = self ._cnf . resource_opener ,
5555
+ opener = self ._tmp_resource_opener ,
5548
5556
parent = self .outerBodyWin ,
5549
5557
global_functions = self ._global_functions ,
5550
5558
)
@@ -6746,6 +6754,10 @@ def keypress(self, char):
6746
6754
self ._station_select_win = None
6747
6755
self ._browser_config_win = None
6748
6756
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')
6749
6761
if ret == self .ws .INSERT_RECORDINGS_DIR_MODE :
6750
6762
self ._open_redordings_dir_select_win ()
6751
6763
elif ret == self .ws .INSERT_RESOURCE_OPENER :
@@ -6984,6 +6996,9 @@ def keypress(self, char):
6984
6996
self ._config_win ._saved_config_options ['dirty_config' ][1 ] = False
6985
6997
self ._cnf .dirty_config = False
6986
6998
''' clean up '''
6999
+ if ret == 1 :
7000
+ ''' canceled '''
7001
+ self ._tmp_resource_opener = self ._cnf .resource_opener
6987
7002
self ._player_select_win = None
6988
7003
self ._encoding_select_win = None
6989
7004
self ._playlist_select_win = None
@@ -7311,6 +7326,7 @@ def keypress(self, char):
7311
7326
# 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))
7312
7327
# logger.error('\nRecordings Directory Selected\n\n')
7313
7328
self ._config_win ._config_options ['resource_opener' ][1 ] = new_opener
7329
+ self ._tmp_resource_opener = new_opener
7314
7330
# logger.info('\n self._config_win._config_options : "{}"'.format(self._config_win._config_options['recording_dir'][1]))
7315
7331
# logger.info('\n self._config_win._saved_config_options : "{}"'.format(self._config_win._saved_config_options['recording_dir'][1]))
7316
7332
# logger.info('\n self.xdg._new_dirs[RECORDINGS] : "{}"'.format(self._cnf.xdg._new_dirs[self._cnf.xdg.RECORDINGS]))
0 commit comments