Merge pull request #2840 from m-bdf/clock-tz-changes
clock: fix construction with calendar.format.today
This commit is contained in:
		
						commit
						6e12f81223
					
				|  | @ -84,7 +84,7 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config) | ||||||
|       fmtMap_.insert({3, config_[kCldPlaceholder]["format"]["today"].asString()}); |       fmtMap_.insert({3, config_[kCldPlaceholder]["format"]["today"].asString()}); | ||||||
|       cldBaseDay_ = |       cldBaseDay_ = | ||||||
|           year_month_day{ |           year_month_day{ | ||||||
|               floor<days>(zoned_time{nullptr, system_clock::now()}.get_local_time())} |               floor<days>(zoned_time{current_zone(), system_clock::now()}.get_local_time())} | ||||||
|               .day(); |               .day(); | ||||||
|     } else |     } else | ||||||
|       fmtMap_.insert({3, "{}"}); |       fmtMap_.insert({3, "{}"}); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue