mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	Load file in qt window
This commit is contained in:
		
							parent
							
								
									05be8d2f0c
								
							
						
					
					
						commit
						81b61ee720
					
				
					 1 changed files with 13 additions and 13 deletions
				
			
		|  | @ -5,6 +5,7 @@ | ||||||
| #include "bootmanager.hxx" | #include "bootmanager.hxx" | ||||||
| 
 | 
 | ||||||
| #include "core.h" | #include "core.h" | ||||||
|  | #include "loader.h" | ||||||
| 
 | 
 | ||||||
| #include "version.h" | #include "version.h" | ||||||
| 
 | 
 | ||||||
|  | @ -35,20 +36,19 @@ void EmuThread::run() | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| 	// Load a game or die...
 | 	// Load a game or die...
 | ||||||
| 	Core::Start(); //autoboot for now
 | 	std::string boot_filename = filename; | ||||||
| 	/*
 | 	std::string error_str; | ||||||
|     if (E_OK == dvd::LoadBootableFile(filename)) { | 	bool res = Loader::LoadFile(boot_filename, &error_str); | ||||||
|         if (common::g_config->enable_auto_boot()) { |  | ||||||
|             core::Start(); |  | ||||||
|         } else { |  | ||||||
|             LOG_ERROR(TMASTER, "Autoboot required in no-GUI mode... Exiting!\n"); |  | ||||||
|         } |  | ||||||
|     } else { |  | ||||||
|         LOG_ERROR(TMASTER, "Failed to load a bootable file... Exiting!\n"); |  | ||||||
|         exit(E_ERR); |  | ||||||
|     } |  | ||||||
| 	*/ |  | ||||||
| 
 | 
 | ||||||
|  | 	if (!res) { | ||||||
|  | 		ERROR_LOG(BOOT, "Failed to load ROM: %s", error_str.c_str()); | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	Core::Start(); //autoboot for now
 | ||||||
|  | 
 | ||||||
|  | 	for (int tight_loop = 0; tight_loop < 10000; ++tight_loop) { | ||||||
|  | 		Core::SingleStep(); | ||||||
|  | 	} | ||||||
| 	/*
 | 	/*
 | ||||||
|     while(core::SYS_DIE != core::g_state)  |     while(core::SYS_DIE != core::g_state)  | ||||||
| 	{ | 	{ | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue