1.1 --- a/gmyth/src/gmyth_livetv.c	Wed May 16 23:53:36 2007 +0100
     1.2 +++ b/gmyth/src/gmyth_livetv.c	Wed May 16 23:55:23 2007 +0100
     1.3 @@ -90,6 +90,7 @@
     1.4  {
     1.5      GMythLiveTV *livetv = GMYTH_LIVETV (object);
     1.6  
     1.7 +
     1.8      if (livetv->disposed)
     1.9      {
    1.10          /* If dispose did already run, return. */
    1.11 @@ -111,6 +112,7 @@
    1.12          livetv->file = NULL;
    1.13      }
    1.14  
    1.15 +
    1.16      if (livetv->recorder != NULL)
    1.17      {
    1.18          //gmyth_recorder_close(livetv->recorder);
    1.19 @@ -130,6 +132,7 @@
    1.20          livetv->tvchain = NULL;
    1.21      }
    1.22  
    1.23 +
    1.24      if (livetv->proginfo != NULL)
    1.25      {
    1.26          g_object_unref (livetv->proginfo);
    1.27 @@ -142,6 +145,7 @@
    1.28          livetv->backend_info = NULL;
    1.29      }
    1.30  
    1.31 +
    1.32      if (livetv->uri != NULL)
    1.33      {
    1.34          g_object_unref (livetv->uri);
    1.35 @@ -154,6 +158,7 @@
    1.36          livetv->mutex = NULL;
    1.37      }
    1.38  
    1.39 +
    1.40      if (livetv->local_hostname != NULL)
    1.41      {
    1.42          g_string_free (livetv->local_hostname, TRUE);
    1.43 @@ -648,12 +653,18 @@
    1.44      return res;
    1.45  
    1.46    error:
    1.47 +    g_mutex_unlock (livetv->mutex);
    1.48 +
    1.49      gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__);
    1.50  
    1.51      res = FALSE;
    1.52  
    1.53 -    if (livetv->local_hostname != NULL)
    1.54 +    if (livetv->local_hostname != NULL) {
    1.55          g_string_free (livetv->local_hostname, TRUE);
    1.56 +		livetv->local_hostname = NULL;
    1.57 +	}
    1.58 +
    1.59 +    gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__);
    1.60  
    1.61      if (livetv->recorder != NULL)
    1.62      {
    1.63 @@ -661,24 +672,33 @@
    1.64          livetv->recorder = NULL;
    1.65      }
    1.66  
    1.67 +    gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__);
    1.68 +
    1.69      if (livetv->tvchain != NULL)
    1.70      {
    1.71          g_object_unref (livetv->tvchain);
    1.72          livetv->tvchain = NULL;
    1.73      }
    1.74  
    1.75 +    gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__);
    1.76 +
    1.77      if (livetv->proginfo != NULL)
    1.78      {
    1.79          g_object_unref (livetv->proginfo);
    1.80          livetv->proginfo = NULL;
    1.81      }
    1.82  
    1.83 +    gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__);
    1.84 +
    1.85      if (livetv->monitor != NULL)
    1.86      {
    1.87          g_object_unref (livetv->monitor);
    1.88          livetv->monitor = NULL;
    1.89      }
    1.90  
    1.91 +
    1.92 +    gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__);
    1.93 +
    1.94      return res;
    1.95  
    1.96  }

     2.1 --- a/gmyth/src/gmyth_socket.c	Wed May 16 23:53:36 2007 +0100
     2.2 +++ b/gmyth/src/gmyth_socket.c	Wed May 16 23:55:23 2007 +0100
     2.3 @@ -247,8 +247,8 @@
     2.4      gint res = gethostname (hname, 50);
     2.5  
     2.6      if (res == -1) {
     2.7 -	gmyth_debug ("Error while getting hostname");
     2.8 -	return g_string_new ("default");
     2.9 +		gmyth_debug ("Error while getting hostname");
    2.10 +		return g_string_new ("default");
    2.11      }
    2.12  
    2.13      return g_string_new (hname);