Merge branch 'upstream' into dev

rabbitgramdesktop · Mar 9, 2024 · b81871d · b81871d
2 parents c2098fb + 14ed839
commit b81871d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Telegram/SourceFiles/data/business/data_business_common.cpp b/Telegram/SourceFiles/data/business/data_business_common.cpp
@@ -231,8 +231,9 @@ WorkingIntervals ExtractDayIntervals(
 }
 
 bool IsFullOpen(const WorkingIntervals &extractedDay) {
-	return extractedDay
-		&& (extractedDay.list.front() == WorkingInterval{ 0, kDay });
+	return extractedDay // 00:00-23:59 or 00:00-00:00 (next day)
+		&& (extractedDay.list.front() == WorkingInterval{ 0, kDay - 60 }
+			|| extractedDay.list.front() == WorkingInterval{ 0, kDay });
 }
 
 WorkingIntervals RemoveDayIntervals(

diff --git a/Telegram/SourceFiles/data/business/data_business_common.h b/Telegram/SourceFiles/data/business/data_business_common.h
@@ -139,7 +139,7 @@ struct WorkingHours {
 	}
 
 	explicit operator bool() const {
-		return !timezoneId.isEmpty();
+		return !timezoneId.isEmpty() && !intervals.list.empty();
 	}
 
 	friend inline bool operator==(

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
@@ -205,7 +205,7 @@ def removeDir(folder):
 def setVar(key, multilineValue):
     singlelineValue = ' '.join(multilineValue.replace('\n', '').split());
     if win:
-        return 'SET ' + key + '="' + singlelineValue + '"';
+        return 'SET "' + key + '=' + singlelineValue + '"';
     return key + '="' + singlelineValue + '"';
 
 def filterByPlatform(commands):