From f02d4dbb59c0c2e8f99d6ddeeafd40e0bf5c73bf Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Thu, 23 Nov 2017 16:17:52 -0500 Subject: [PATCH] Ensures Oric video output starts up and changes validly. --- Machines/Oric/Oric.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Machines/Oric/Oric.cpp b/Machines/Oric/Oric.cpp index ef423aa56..585e8adf7 100644 --- a/Machines/Oric/Oric.cpp +++ b/Machines/Oric/Oric.cpp @@ -373,6 +373,7 @@ class ConcreteMachine: video_output_.reset(new VideoOutput(ram_)); if(!colour_rom_.empty()) video_output_->set_colour_rom(colour_rom_); + set_output_device(Configurable::Display::RGB); } void close_output() override final { @@ -447,7 +448,7 @@ class ConcreteMachine: Configurable::Display display; if(Configurable::get_display(selections_by_option, display)) { - get_crt()->set_output_device((display == Configurable::Display::RGB) ? Outputs::CRT::OutputDevice::Monitor : Outputs::CRT::OutputDevice::Television); + set_output_device((display == Configurable::Display::RGB) ? Outputs::CRT::OutputDevice::Monitor : Outputs::CRT::OutputDevice::Television); } }