@@ -138,7 +138,7 @@ def __init__(self, app):
138138 self .show_metrics = False
139139 self .show_render_settings = False
140140 self .side_panel_visible = True
141- self .load_file_lock = False
141+ self .is_filedialog_open = False
142142
143143 self .app = app
144144
@@ -201,20 +201,16 @@ def draw_loading(self):
201201 ImGui .Text ("Loading.. " )
202202 ImGui .End ()
203203
204- def reload (self ):
205- if app .infile :
206- app .restart = True
207- app .getRoot ().queueEndRendering ()
208-
209204 def load_file (self ):
210205 # Avoid recursive calling, which might block the window manager
211- if self .load_file_lock :
206+ if self .is_filedialog_open :
212207 return
213208 else :
214- self .load_file_lock = True
209+ self .is_filedialog_open = True
215210 app .infile = askopenfilename (app .filedir )
216- self .load_file_lock = False
217- self .reload ()
211+ self .is_filedialog_open = False
212+ if app .infile is not None :
213+ app .reload ()
218214
219215 def preRenderTargetUpdate (self , evt ):
220216 if not self .app .cam .getViewport ().getOverlaysEnabled ():
@@ -233,8 +229,8 @@ def preRenderTargetUpdate(self, evt):
233229 if ImGui .BeginMenu ("File" ):
234230 if ImGui .MenuItem ("Open File" , "F1" ):
235231 self .load_file ()
236- if ImGui .MenuItem ("ReLoad File" , "F5" ):
237- self .reload ()
232+ if ImGui .MenuItem ("Reload File" , "F5" ):
233+ app .reload ()
238234 if ImGui .MenuItem ("Save Screenshot" , "P" ):
239235 self .app ._save_screenshot ()
240236 ImGui .Separator ()
@@ -474,7 +470,7 @@ def keyPressed(self, evt):
474470 elif evt .keysym .sym == OgreBites .SDLK_F1 :
475471 self .gui .load_file ()
476472 elif evt .keysym .sym == OgreBites .SDLK_F5 :
477- self .gui . reload ()
473+ self .reload ()
478474
479475 return True
480476
@@ -530,6 +526,11 @@ def _save_screenshot(self):
530526 self .getRenderWindow ().writeContentsToTimestampedFile (outpath , ".png" )
531527 self .cam .getViewport ().setOverlaysEnabled (True )
532528
529+ def reload (self ):
530+ if app .infile :
531+ app .restart = True
532+ app .getRoot ().queueEndRendering ()
533+
533534 def locateResources (self ):
534535 self .filename = os .path .basename (self .infile )
535536 self .filedir = os .path .dirname (self .infile )
0 commit comments