From 4b4acc5f5ad54efe5731a6a14b5af9d00c52daba Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 13 Jun 2017 15:54:36 +0200
Subject: [PATCH] Minor config fixes

---
 qutebrowser/app.py                           | 2 +-
 qutebrowser/browser/webkit/webkitsettings.py | 2 +-
 qutebrowser/config/configdata.yml            | 2 +-
 qutebrowser/config/configtypes.py            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index dcc2620f0..df3168e88 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -674,7 +674,7 @@ class Quitter:
             if session is not None:
                 session_manager.save(session, last_window=last_window,
                                      load_next_time=True)
-            elif config.val.save_session:
+            elif config.val.auto_save.session:
                 session_manager.save(sessions.default, last_window=last_window,
                                      load_next_time=True)
 
diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py
index a51c7384f..769d692bc 100644
--- a/qutebrowser/browser/webkit/webkitsettings.py
+++ b/qutebrowser/browser/webkit/webkitsettings.py
@@ -175,7 +175,7 @@ MAPPINGS = {
         CookiePolicy(),
     'content.dns_prefetch':
         Attribute(QWebSettings.DnsPrefetchEnabled),
-    'content.frame-flattening':
+    'content.frame_flattening':
         Attribute(QWebSettings.FrameFlatteningEnabled),
     'content.offline_web_application_cache':
         Attribute(QWebSettings.OfflineWebApplicationCacheEnabled),
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 0c4c6924c..f7c3aa7d7 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -262,7 +262,7 @@ messages.unfocused:
 
 confirm_quit:
   type: ConfirmQuit
-  default: never
+  default: [never]
   desc: Whether to confirm quitting the application.
 
 zoom.text_only:
diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index 88e474a4a..ee8713b8c 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -397,7 +397,7 @@ class FlagList(List):
     _show_valtype = False
 
     def __init__(self, none_ok=False, valid_values=None):
-        super().__init__(BaseType(), none_ok)
+        super().__init__(String(), none_ok)
         self.valtype.valid_values = valid_values
 
     def _check_duplicates(self, values):