https://github.com/syuilo/misskey/pull/4549#discussion_r287750004

22c48421 · tamaina · Satsuki Yanagi · 788edd36 · 22c48421
Unverified Commit 22c48421 authored 5 years ago by tamaina Committed by Satsuki Yanagi 5 years ago
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -84,9 +84,14 @@

 	// Detect the user agent
 	const ua = navigator.userAgent.toLowerCase();
-	const isMobile = settings.device.appTypeForce === 'mobile' ||
-		(settings.device.appTypeForce !== 'desktop'
-			&& (/mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576));
+	let isMobile = /mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576
+	if (settings && settings.device.appTypeForce) {
+		if (settings.device.appTypeForce === 'mobile') {
+			isMobile = true
+		} else if (settings.device.appTypeForce === 'desktop') {
+			isMobile = false
+		}
+	}

 	// Get the <head> element
 	const head = document.getElementsByTagName('head')[0];