That didn't really work. So revert to old CSS for gray notes.

[lyx.git] / src / Compare.cpp

diff --git a/src/Compare.cpp b/src/Compare.cpp
index eb98b383027d8898ed5843f73f5d1096bd4d2a40..745b3218a3bf84aa8a39e0916e4ce9d667a74434 100644 (file)
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -30,7 +30,7 @@ class Compare::Impl {
 public:
        ///
        Impl(Compare const & compare) 
-               : compare_(compare), abort_(false)
+               : abort_(false), compare_(compare)
        {}
 
        ///
@@ -55,8 +55,10 @@ Compare::Compare(Buffer const * new_buf, Buffer const * old_buf,
 
 void Compare::run()
 {
-       if (!dest_buffer || !new_buffer || !old_buffer)
+       if (!dest_buffer || !new_buffer || !old_buffer) {
+               error();
                return;
+       }
 
        // Copy the buffer params to the new buffer
        dest_buffer->params() = options_.settings_from_new
@@ -64,9 +66,9 @@ void Compare::run()
        
        // do the real work
        if (!doCompare())
-               return;
-       
-       finished(pimpl_->abort_);
+               error();
+       else
+               finished(pimpl_->abort_);
        return;
 }
 
@@ -82,7 +84,7 @@ void Compare::abort()
 
 int Compare::doCompare()
 {
-       return 1;
+       return 0;
 }