Make sure that changing the view mode does not fail

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 303ee34af2dbf60edf5f0900d7935cc28fd135b9..e879f67fca911cc9520b95be5bb0ad346376b0b4 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -248,9 +248,12 @@ void DolphinView::setMode(Mode mode)
     if (mode != m_mode) {
         ViewProperties props(viewPropertiesUrl());
         props.setViewMode(mode);
     if (mode != m_mode) {
         ViewProperties props(viewPropertiesUrl());
         props.setViewMode(mode);

-        props.save();

 
 

-        applyViewProperties();
+        // We pass the new ViewProperties to applyViewProperties, rather than
+        // storing them on disk and letting applyViewProperties() read them
+        // from there, to prevent that changing the view mode fails if the
+        // .directory file is not writable (see bug 318534).
+        applyViewProperties(props);

     }
 }
 
     }
 }
 


@@ -1508,9 +1511,13 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
 
 void DolphinView::applyViewProperties()
 {
 
 void DolphinView::applyViewProperties()
 {

-    m_view->beginTransaction();
-

     const ViewProperties props(viewPropertiesUrl());
     const ViewProperties props(viewPropertiesUrl());

+    applyViewProperties(props);
+}
+
+void DolphinView::applyViewProperties(const ViewProperties& props)
+{
+    m_view->beginTransaction();

 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {
 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {