mirror of
				https://github.com/AlexandreRouma/SDRPlusPlus.git
				synced 2025-10-31 17:08:13 +01:00 
			
		
		
		
	Merge pull request #1035 from AlexandreRouma/master
merge back changes to master
This commit is contained in:
		| @@ -33,7 +33,7 @@ ModuleManager::Module_t ModuleManager::loadModule(std::string path) { | ||||
| #else | ||||
|     mod.handle = dlopen(path.c_str(), RTLD_LAZY | RTLD_LOCAL); | ||||
|     if (mod.handle == NULL) { | ||||
|         flog::error("Couldn't load {0}.", path); | ||||
|         flog::error("Couldn't load {0}: {1}", path, dlerror()); | ||||
|         mod.handle = NULL; | ||||
|         return mod; | ||||
|     } | ||||
| @@ -183,4 +183,4 @@ void ModuleManager::doPostInitAll() { | ||||
|         flog::info("Running post-init for {0}", name); | ||||
|         inst.instance->postInit(); | ||||
|     } | ||||
| } | ||||
| } | ||||
|   | ||||
| @@ -1,5 +1,6 @@ | ||||
| #pragma once | ||||
| #include <stdint.h> | ||||
| #include <string> | ||||
| #include <mutex> | ||||
| #include <memory> | ||||
| #include <map> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user