Skip to content

Commit

Permalink
Only call g_type_init() when GIO dependency is enabled. Closes: #461.
Browse files Browse the repository at this point in the history
  • Loading branch information
jlindgren90 committed Aug 22, 2014
1 parent 04b160d commit 6dfb6b6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/audacious/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,10 @@ static void do_remote (void)
ObjAudacious * obj = nullptr;
GError * error = nullptr;

#if ! GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif

/* check whether this is the first instance */
if (dbus_server_init () != StartupType::Client)
return;
Expand Down Expand Up @@ -324,10 +328,6 @@ int main (int argc, char * * argv)
aud_init_paths ();
aud_init_i18n ();

#if ! GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif

if (! parse_options (argc, argv))
{
print_help ();
Expand Down

0 comments on commit 6dfb6b6

Please sign in to comment.