From 4446427552585b7c0f71be480c4f7ca542a5ebfd Mon Sep 17 00:00:00 2001
From: Mawoka <git@mawoka.eu>
Date: Mon, 26 Dec 2022 11:17:18 +0100
Subject: [PATCH] :bug: Fixed failed merge

---
 frontend/src/lib/editor/card.svelte | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/editor/card.svelte b/frontend/src/lib/editor/card.svelte
index a79b74f..856e0e2 100644
--- a/frontend/src/lib/editor/card.svelte
+++ b/frontend/src/lib/editor/card.svelte
@@ -12,7 +12,6 @@
 	import Spinner from '../Spinner.svelte';
 	import { createTippy } from 'svelte-tippy';
 	import { getLocalization } from '$lib/i18n';
-	import Slide from './slide.svelte';
 
 	const { t } = getLocalization();
 
@@ -67,7 +66,13 @@
 				/>
 			</div>
 		</div>
-		{#if data.questions[selected_question].time}
+		{#if data.questions[selected_question].type === QuizQuestionType.SLIDE}
+			{#await import('./slide.svelte')}
+				<Spinner my_20={false} />
+			{:then c}
+				<svelte:component this={c.default} bind:data={data.questions[selected_question]} />
+			{/await}
+		{:else}
 			<div class="flex flex-col">
 				<div class="flex justify-center pt-10 w-full">
 					{#await import('$lib/inline-editor.svelte')}
@@ -179,8 +184,6 @@
 					{$t('editor_page.right_click_to_delete')}
 				</p>
 			</div>
-		{:else}
-			<Slide bind:data={data.questions[selected_question]} />
 		{/if}
 	</div>
 </div>