浏览代码

Fix window title with restored session

Johannes Hofmann 7 年前
父节点
当前提交
247770609a
共有 1 个文件被更改,包括 12 次插入8 次删除
  1. 12
    8
      src/main.rs

+ 12
- 8
src/main.rs 查看文件

218
     let mut sources = TileSources::new(config.tile_sources())
218
     let mut sources = TileSources::new(config.tile_sources())
219
         .ok_or_else(|| "no tile sources provided.")?;
219
         .ok_or_else(|| "no tile sources provided.")?;
220
 
220
 
221
+    let last_session = if config.open_last_session() {
222
+        config::read_last_session().ok()
223
+    } else {
224
+        None
225
+    };
226
+
227
+    if let Some(tile_source) = last_session.as_ref().and_then(|s| s.tile_source.as_ref()) {
228
+        sources.switch_to_name(tile_source);
229
+    }
230
+
221
     let mut events_loop = glutin::EventsLoop::new();
231
     let mut events_loop = glutin::EventsLoop::new();
222
     let builder = glutin::WindowBuilder::new()
232
     let builder = glutin::WindowBuilder::new()
223
         .with_title(format!("DeltaMap - {}", sources.current_name()));
233
         .with_title(format!("DeltaMap - {}", sources.current_name()));
241
         )
251
         )
242
     };
252
     };
243
 
253
 
244
-    if config.open_last_session() {
245
-        if let Ok(session) = config::read_last_session().as_ref() {
246
-            map.restore_session(session);
247
-
248
-            if let Some(ref tile_source) = session.tile_source {
249
-                sources.switch_to_name(tile_source);
250
-            }
251
-        }
254
+    if let Some(ref session) = last_session {
255
+        map.restore_session(session);
252
     }
256
     }
253
 
257
 
254
     let mut input_state = InputState {
258
     let mut input_state = InputState {