Yet another printing bug.

wxMaxima-developers · May 16, 2021 · 23e7c29 · 23e7c29
1 parent 8ab5e0c
commit 23e7c29
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ if(WIN32)
     enable_language(RC)
 endif()
 
-set(VERSION 21.05.0-DevelopmentSnapshot)
+set(VERSION 21.05.1)
 set(GITVERSION ${VERSION})
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,6 @@
+# 21.05.1:
+ * Resolved a segfault on printing that could be triggered on some computers
+
 # 21.05.0:
  * Long numbers now can be broken into lines 
  * On Export long numbers sometimes got lost

diff --git a/data/io.github.wxmaxima_developers.wxMaxima.appdata.xml b/data/io.github.wxmaxima_developers.wxMaxima.appdata.xml
@@ -50,6 +50,13 @@
   <content_rating type="oars-1.0">
     <content_attribute id="social-info">mild</content_attribute>
   </content_rating>
+   <release version="21.05.1" date="2021-05-16T17:04:00Z">
+      <description>
+	<p>
+	  Fixes a crash on printing that could be triggered on some computers.
+	</p>
+      </description>
+  </release>
   <releases>
 
     <!-- prefer to use date with approximate UTC time - this way the verifier won't trip due

diff --git a/src/Worksheet.h b/src/Worksheet.h
@@ -1637,7 +1637,11 @@ class Worksheet : public wxScrolled<wxWindow>
 };
 
 inline Worksheet *Cell::GetWorksheet() const
-{ return static_cast<Worksheet*>((*m_configuration)->GetWorkSheet()); }
+{
+  wxWindow *worksheet = (*m_configuration)->GetWorkSheet();
+  wxASSERT(worksheet != NULL);
+  return static_cast<Worksheet*>(worksheet);
+}
 
 inline void Configuration::SetWorkSheet(wxWindow *workSheet)
 { m_workSheet = dynamic_cast<Worksheet*>(workSheet); }

diff --git a/src/cells/ImgCell.cpp b/src/cells/ImgCell.cpp
@@ -85,7 +85,7 @@ ImgCell::ImgCell(GroupCell *group, Configuration **config, const wxString &image
 }
 
 ImgCell::ImgCell(GroupCell *group, const ImgCell &cell) :
-  Cell(group, m_configuration),
+  Cell(group, cell.m_configuration),
   m_imageBorderWidth(1)
 {
   InitBitFields();