Res::get file errors #641

timi-liuliang · Apr 21, 2020 · 9dcb087 · 9dcb087
1 parent e88cbcb
commit 9dcb087
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/editor/QLibrary/Resources/QLibrary/propertyeditor/QResSelect.cpp b/editor/QLibrary/Resources/QLibrary/propertyeditor/QResSelect.cpp
@@ -113,15 +113,18 @@ namespace QT_UI
 		Echo::String path = val;
 		if (!path.empty())
 		{
-			Echo::String fullPath = Echo::IO::instance()->convertResPathToFullPath(path);
 			Echo::String ext = Echo::PathUtil::GetFileExt(path, true);
-			if (Echo::StringUtil::Equal(ext, ".png", false))
+			if (!ext.empty())
 			{
-				QPixmap pixmap(fullPath.c_str());
-				QRect tRect = QRect(rect.left() + 3, rect.top() + 2, rect.height() - 4, rect.height() - 4);
-				painter->drawPixmap(tRect, pixmap);
+				Echo::String fullPath = Echo::IO::instance()->convertResPathToFullPath(path);
+				if (Echo::StringUtil::Equal(ext, ".png", false))
+				{
+					QPixmap pixmap(fullPath.c_str());
+					QRect tRect = QRect(rect.left() + 3, rect.top() + 2, rect.height() - 4, rect.height() - 4);
+					painter->drawPixmap(tRect, pixmap);
 
-				return true;
+					return true;
+				}
 			}
 		}
 

diff --git a/editor/echo/Editor/UI/ResPanel/QPreviewHelper/QPreviewHelper.cpp b/editor/echo/Editor/UI/ResPanel/QPreviewHelper/QPreviewHelper.cpp
@@ -164,13 +164,17 @@ namespace QT_UI
 			Echo::String resPath;
 			if (Echo::IO::instance()->convertFullPathToResPath(fullPath, resPath))
 			{
-				Echo::ResPtr res = Echo::Res::get(resPath);
-				if (res && res->getEditor())
+				Echo::String extWithDot = Echo::PathUtil::GetFileExt(resPath, true);
+				if (Echo::Res::getResFunByExtension(extWithDot))
 				{
-					icon = res->getEditor()->getThumbnail();
-
-					if(res->getEditor()->isThumbnailStatic())
-						resIconMap[fileExt] = icon;
+					Echo::ResPtr res = Echo::Res::get(resPath);
+					if (res && res->getEditor())
+					{
+						icon = res->getEditor()->getThumbnail();
+
+						if (res->getEditor()->isThumbnailStatic())
+							resIconMap[fileExt] = icon;
+					}
 				}
 			}