From 064a1750279be244f86cf24f29749b391b11f1dd Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 1 Dec 2019 22:10:10 +0100
Subject: Renamed GuzzleServiceProvider to HttpClientServiceProvider, fixed
 translation and import error

---
 includes/pages/schedule/ImportSchedule.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/pages/schedule/ImportSchedule.php b/includes/pages/schedule/ImportSchedule.php
index 8bc769d4..136f1816 100644
--- a/includes/pages/schedule/ImportSchedule.php
+++ b/includes/pages/schedule/ImportSchedule.php
@@ -451,13 +451,14 @@ class ImportSchedule extends BaseController
             $guid = $shift->guid;
             $shift = $this->loadShift($shift->shift_id);
             $event = $scheduleEvents[$guid];
+            $room = $rooms->where('name', $event->getRoom()->getName())->first();
 
             if (
                 $shift->title != $event->getTitle()
                 || $shift->shift_type_id != $shiftType
                 || Carbon::createFromTimestamp($shift->start) != $event->getDate()
                 || Carbon::createFromTimestamp($shift->end) != $event->getEndDate()
-                || $shift->room_id != $rooms->where('name', $event->getRoom()->getName())->first()->id
+                || $shift->room_id != ($room->id ?? '')
                 || $shift->url != $event->getUrl()
             ) {
                 $changeEvents[$guid] = $event;
-- 
cgit v1.2.3-54-g00ecf