[prev in list] [next in list] [prev in thread] [next in thread] 

List:       haiku-commits
Subject:    [haiku-commits] [S] Change in haiku[master]: app_server: remove new font family from the manager in 
From:       Gerrit <review () review ! haiku-os ! org>
Date:       2024-04-28 16:30:13
Message-ID: b25bfab3570dd541c1398dd293124d1d2b306926-HTML () review ! haiku-os ! org
[Download RAW message or body]

From Máximo Castañeda <antiswen@yahoo.es>:

Máximo Castañeda has uploaded this change for review. ( \
https://review.haiku-os.org/c/haiku/+/7632?usp=email )


Change subject: app_server: remove new font family from the manager in case of error
......................................................................

app_server: remove new font family from the manager in case of error

Change-Id: I8a1538b9706ed1c6eb5d104332ddbf3b7f223faa
---
M src/servers/app/font/FontManager.cpp
1 file changed, 12 insertions(+), 1 deletion(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/32/7632/1

diff --git a/src/servers/app/font/FontManager.cpp \
b/src/servers/app/font/FontManager.cpp index ff94063..fd241a4 100644
--- a/src/servers/app/font/FontManager.cpp
+++ b/src/servers/app/font/FontManager.cpp
@@ -329,8 +329,10 @@

 	if (style == NULL || !family->AddStyle(style)) {
 		delete style;
-		if (isNewFontFamily)
+		if (isNewFontFamily) {
+			fFamilies.RemoveItem(family);
 			delete family;
+		}
 		return B_NO_MEMORY;
 	}


--
To view, visit https://review.haiku-os.org/c/haiku/+/7632?usp=email
To unsubscribe, or for help writing mail filters, visit \
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I8a1538b9706ed1c6eb5d104332ddbf3b7f223faa
Gerrit-Change-Number: 7632
Gerrit-PatchSet: 1
Gerrit-Owner: Máximo Castañeda <antiswen@yahoo.es>
Gerrit-MessageType: newchange


[Attachment #3 (text/html)]

<p>Máximo Castañeda has uploaded this change for <strong>review</strong>.</p><p><a \
href="https://review.haiku-os.org/c/haiku/+/7632?usp=email">View Change</a></p><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;">app_server: remove \
new font family from the manager in case of error<br><br>Change-Id: \
I8a1538b9706ed1c6eb5d104332ddbf3b7f223faa<br>---<br>M \
src/servers/app/font/FontManager.cpp<br>1 file changed, 12 insertions(+), 1 \
deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: \
pre-wrap;">git pull ssh://git.haiku-os.org:22/haiku refs/changes/32/7632/1</pre><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git \
a/src/servers/app/font/FontManager.cpp \
b/src/servers/app/font/FontManager.cpp</span><br><span>index ff94063..fd241a4 \
100644</span><br><span>--- a/src/servers/app/font/FontManager.cpp</span><br><span>+++ \
b/src/servers/app/font/FontManager.cpp</span><br><span>@@ -329,8 +329,10 \
@@</span><br><span> </span><br><span> 	if (style == NULL || \
!family-&gt;AddStyle(style)) {</span><br><span> 		delete style;</span><br><span \
style="color: hsl(0, 100%, 40%);">-		if (isNewFontFamily)</span><br><span \
style="color: hsl(120, 100%, 40%);">+		if (isNewFontFamily) {</span><br><span \
style="color: hsl(120, 100%, \
40%);">+			fFamilies.RemoveItem(family);</span><br><span> 			delete \
family;</span><br><span style="color: hsl(120, 100%, 40%);">+		}</span><br><span> \
return B_NO_MEMORY;</span><br><span> 	}</span><br><span> \
</span><br><span></span><br></pre><p>To view, visit <a \
href="https://review.haiku-os.org/c/haiku/+/7632?usp=email">change 7632</a>. To \
unsubscribe, or for help writing mail filters, visit <a \
href="https://review.haiku-os.org/settings">settings</a>.</p><div itemscope \
itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" \
itemtype="http://schema.org/ViewAction"><link itemprop="url" \
href="https://review.haiku-os.org/c/haiku/+/7632?usp=email"/><meta itemprop="name" \
content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: haiku </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: \
I8a1538b9706ed1c6eb5d104332ddbf3b7f223faa </div> <div style="display:none"> \
Gerrit-Change-Number: 7632 </div> <div style="display:none"> Gerrit-PatchSet: 1 \
</div> <div style="display:none"> Gerrit-Owner: Máximo Castañeda \
&lt;antiswen@yahoo.es&gt; </div> <div style="display:none"> Gerrit-MessageType: \
newchange </div>



[prev in list] [next in list] [prev in thread] [next in thread]