Enable OK/Apply buttons when resetting to class defaults.

[lyx.git] / src / BranchList.cpp

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 1277be23281a956a7d1dfe28314504ad0fac5655..4624f19f4da4c2091b0375112bf57d1343d64b77 100644 (file)
--- a/src/BranchList.cpp
+++ b/src/BranchList.cpp
@@ -30,7 +30,9 @@ namespace {
 class BranchNamesEqual : public std::unary_function<Branch, bool>
 {
 public:
-       BranchNamesEqual(docstring const & name) : name_(name) {}
+       BranchNamesEqual(docstring const & name)
+               : name_(name)
+       {}
 
        bool operator()(Branch const & branch) const
        {
@@ -39,6 +41,7 @@ public:
 private:
        docstring name_;
 };
+
 }
 
 
@@ -48,6 +51,8 @@ Branch::Branch()
        // no theApp() with command line export
        if (theApp())
                theApp()->getRgbColor(Color_background, color_);
+       else
+               frontend::Application::getRgbColorUncached(Color_background, color_);
 }
 
 
@@ -106,9 +111,14 @@ void Branch::setColor(string const & str)
 {
        if (str.size() == 7 && str[0] == '#')
                color_ = rgbFromHexName(str);
-       else
+       else {
                // no color set or invalid color - use normal background
-               theApp()->getRgbColor(Color_background, color_);
+               // no theApp() with command line export
+               if (theApp())
+                       theApp()->getRgbColor(Color_background, color_);
+               else
+                       frontend::Application::getRgbColorUncached(Color_background, color_);
+       }
 }