jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Separate crash handler from startup

Browse Source
This commit is contained in:
Zachary Lund 2018-04-24 11:57:56 -07:00
parent 30d967eafa
commit 121035346f
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libobs/obs-windows.c
View File

@ -788,6 +788,13 @@ void reset_win32_symbol_paths(void)
da_free(paths);
}
extern void initialize_crash_handler(void);
void obs_init_win32_crash_handler(void)
{
initialize_crash_handler();
}
void initialize_com(void)
{
CoInitializeEx(0, COINIT_MULTITHREADED);

2
libobs/obs.c
View File

@ -776,7 +776,6 @@ static bool obs_init(const char *locale, const char *module_config_path,
}
#ifdef _WIN32
extern void initialize_crash_handler(void);
extern void initialize_com(void);
extern void uninitialize_com(void);
#endif
@ -795,7 +794,6 @@ bool obs_startup(const char *locale, const char *module_config_path,
}
#ifdef _WIN32
initialize_crash_handler();
initialize_com();
#endif

6
libobs/obs.h
View File

@ -276,6 +276,12 @@ EXPORT void obs_set_locale(const char *locale);
/** @return the current locale */
EXPORT const char *obs_get_locale(void);
/** Initialize the Windows-specific crash handler */
#ifdef _WIN32
EXPORT void obs_init_win32_crash_handler(void);
#endif
/**
* Returns the profiler name store (see util/profiler.h) used by OBS, which is
* either a name store passed to obs_startup, an internal name store, or NULL