tv spec given on command line given priority

JetSetIlly · Jun 23, 2024 · 4149e73 · 4149e73
1 parent f063152
commit 4149e73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/debugger/debugger.go b/debugger/debugger.go
@@ -1247,8 +1247,9 @@ func (dbg *Debugger) attachCartridge(cartload cartridgeloader.Loader) (e error)
 	// reset cartridge loader after using it in the preview
 	cartload.Seek(0, io.SeekStart)
 
-	// copy resizer from preview to main emulation
-	dbg.vcs.TV.SetSpec(dbg.preview.Results().SpecID, true)
+	// copy resizer from preview to main emulation. we don't want to force the
+	// change of specification however
+	dbg.vcs.TV.SetSpec(dbg.preview.Results().SpecID, false)
 	dbg.vcs.TV.SetResizer(dbg.preview.Results().Resizer)
 
 	// activate bot if possible

diff --git a/setup/television.go b/setup/television.go
@@ -88,7 +88,7 @@ func (set television) apply(vcs *hardware.VCS) (string, error) {
 	// VCS, any setup entries will take precedence over any spec in the
 	// cartridge filename.
 
-	err := vcs.TV.SetSpec(set.spec, false)
+	err := vcs.TV.SetSpec(set.spec, true)
 	if err != nil {
 		return "", err
 	}