Merge pull request #12 from Zabrimus/upstream

Upstream

Author: hannemann

info.cpp

@@ -248,10 +248,12 @@ SerDevice InfoResponder::getDeviceSerializeInfo(int index) {
   bool live = false;
 
   if (dev->ProvidesSource(cSource::stCable) || dev->ProvidesSource(cSource::stSat) || dev->ProvidesSource(cSource::stTerr) || dev->ProvidesSource(cSource::stAtsc)) {
-      channelName = (string)chan->Name();
-      channelId = (string)chan->GetChannelID().ToString();
-      channelNr = chan->Number();
-      live = channelNr == StatusMonitor::get()->getChannel();
+	  if (chan) {
+		  channelName = (string)chan->Name();
+		  channelId = (string)chan->GetChannelID().ToString();
+		  channelNr = chan->Number();
+		  live = channelNr == StatusMonitor::get()->getChannel();
+	  }
 
       hasCi = dev->HasCi();
       signalStrength = dev->SignalStrength();

timers.cpp

@@ -119,6 +119,7 @@ void TimersResponder::createOrUpdateTimer(ostream& out, cxxtools::http::Request&
         if ( !v.IsWeekdaysValid(weekdays) ) { weekdays = v.ConvertWeekdays(timer_orig->WeekDays()); }
         if ( !v.IsDayValid(day) ) { day = v.ConvertDay(timer_orig->Day()); }
         if ( chan == NULL ) { chan = (cChannel*)timer_orig->Channel(); }
+        if ( aux == "" ) { aux = v.ConvertAux(timer_orig->Aux()); }
      }
   }