[education/rkward] /: cleanup

[Thomas Friedrichsmeier]

Git commit 6de6c9782b43b326636d1e9e93627360158f2c29 by Thomas Friedrichsmeier.
Committed on 03/04/2022 at 16:26.
Pushed by tfry into branch 'master'.

cleanup

M  +2    -8    ChangeLog
M  +1    -1    rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp

https://invent.kde.org/education/rkward/commit/6de6c9782b43b326636d1e9e93627360158f2c29

diff --git a/ChangeLog b/ChangeLog
index b30b0be3..57407978 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,4 @@
-TODOS for autotests:
-  - Check and update the standards files
-  - Use options(warn=1), in order to get warnings into the test?
-
+--- Version 0.7.3 - UNRELEASED
 - Fix compilation with the upcoming R 4.2.0
 - Support for switching color schemes, including basic support for dark mode
 - Fix crash in dev.capture()
@@ -13,7 +10,7 @@ TODOS for autotests:
 - Implement R 4.1 graphics functions: gradients, patterns, clip paths, masks
 - Add icons to settings dialog for quick visual orientation
 - Merge ktexteditor (script) settings into the main settings dialog
-- Internal: Code cleanup around settings
+- Internal: Code cleanup around settings, and in many other places
 - Output file handling has been reworked, entirely
 - Fixed: Cursor navigation in completion list
 - rkwardtests library gains helper functions for checking for expected errors
@@ -24,9 +21,6 @@ TODOS for autotests:
 - (Try to) automatically create custom R library locations, if they do not exist
 - Workaround for invalid EDITOR variable set by Kate Terminal plugin (also fixed in recent kate)
 - kate plugin related actions are now active whenever a script window is active (not only the corresponding tool window)
-  - TODO: support kate plugins in detached windows
-
---- Version 0.7.2b - UNRELEASED
 - Fixed: Crash when attempting to use new graphics features in R 4.1.0 (esp. plotting using ggplot2)
 
 --- Version 0.7.2 - Oct-16-2020
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
index 0b02f2e6..529ce502 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
@@ -76,7 +76,7 @@ void RKStartGraphicsDevice (double width, double height, double pointsize, const
 	desc->width = width;
 	desc->height = height;
 
-	if (R_GE_getVersion() == R_GE_version) {
+	if (R_GE_getVersion() != R_GE_version) {
 		RKRBackend::this_pointer->graphicsEngineMismatchMessage(R_GE_version, R_GE_getVersion());
 		Rf_error("Graphics version mismatch");
 	}