svn commit: r346024 - head/usr.sbin/vidcontrol

[Bruce Evans]

Author: bde
Date: Mon Apr  8 04:07:37 2019
New Revision: 346024
URL: https://svnweb.freebsd.org/changeset/base/346024

Log:
  Fix restoring the geometry when recovering from an error.  Just restore the
  previous geometry, and don't do extra work to calculate the default geometry
  so as to reset to that.

Modified:
  head/usr.sbin/vidcontrol/vidcontrol.c

Modified: head/usr.sbin/vidcontrol/vidcontrol.c
==============================================================================
--- head/usr.sbin/vidcontrol/vidcontrol.c	Mon Apr  8 03:35:47 2019	(r346023)
+++ head/usr.sbin/vidcontrol/vidcontrol.c	Mon Apr  8 04:07:37 2019	(r346024)
@@ -171,9 +171,8 @@ revert(void)
 		else
 			ioctl(0, _IO('S', cur_info.video_mode_number), NULL);
 		if (cur_info.video_mode_info.vi_flags & V_INFO_GRAPHICS) {
-			size[0] = cur_info.video_mode_info.vi_width / 8;
-			size[1] = cur_info.video_mode_info.vi_height /
-			    cur_info.console_info.font_size;
+			size[0] = cur_info.console_info.mv_csz;
+			size[1] = cur_info.console_info.mv_rsz;
 			size[2] = cur_info.console_info.font_size;
 			ioctl(0, KDRASTER, size);
 		}