From 9a884b7bf77471c324bb27ea9e57ea224e1b42b4 Mon Sep 17 00:00:00 2001
From: hunbernd
Date: Fri, 5 Jul 2019 13:41:30 +0200
Subject: [PATCH 1/3] Rise max public chat message size to 31000 bytes Rise
color palette size from 16 to 256 colors
Note: Max chat item size is 32000 without splitting the message.
31000 = 32000 - some place left for other fields
---
libretroshare/src/chat/p3chatservice.cc | 2 +-
retroshare-gui/src/util/imageutil.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libretroshare/src/chat/p3chatservice.cc b/libretroshare/src/chat/p3chatservice.cc
index 482120940..e446bfdef 100644
--- a/libretroshare/src/chat/p3chatservice.cc
+++ b/libretroshare/src/chat/p3chatservice.cc
@@ -47,7 +47,7 @@
* #define CHAT_DEBUG 1
****/
-static const uint32_t MAX_MESSAGE_SECURITY_SIZE = 6000 ; // Max message size to forward other friends
+static const uint32_t MAX_MESSAGE_SECURITY_SIZE = 31000 ; // Max message size to forward other friends
static const uint32_t MAX_AVATAR_JPEG_SIZE = 32767; // Maximum size in bytes for an avatar. Too large packets
// don't transfer correctly and can kill the system.
// Images are 96x96, which makes approx. 27000 bytes uncompressed.
diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index cefa22906..648fe392c 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -99,9 +99,9 @@ bool ImageUtil::optimizeSize(QString &html, const QImage& original, QImage &opti
}
//Use binary search to find a suitable image size + linear regression to guess the file size
- double maxsize = (double)checkSize(html, optimized = original.scaledToWidth(maxwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct), maxBytes);
+ double maxsize = (double)checkSize(html, optimized = original.scaledToWidth(maxwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct, Qt::ThresholdDither), maxBytes);
if(maxsize <= maxBytes) return true; //success
- double minsize = (double)checkSize(html, optimized = original.scaledToWidth(minwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct), maxBytes);
+ double minsize = (double)checkSize(html, optimized = original.scaledToWidth(minwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct, Qt::ThresholdDither), maxBytes);
if(minsize > maxBytes) return false; //impossible
// std::cout << "maxS: " << maxsize << " minS: " << minsize << std::endl;
@@ -114,7 +114,7 @@ bool ImageUtil::optimizeSize(QString &html, const QImage& original, QImage &opti
double b = maxsize - m * ((double)maxwidth * (double)maxwidth / whratio);
double a = ((double)(maxBytes - region/2) - b) / m; //maxBytes - region/2 target the center of the accepted region
int nextwidth = (int)sqrt(a * whratio);
- int nextsize = checkSize(html, optimized = original.scaledToWidth(nextwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct), maxBytes);
+ int nextsize = checkSize(html, optimized = original.scaledToWidth(nextwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct, Qt::ThresholdDither), maxBytes);
if(nextsize <= maxBytes) {
minsize = nextsize;
minwidth = nextwidth;
@@ -188,7 +188,7 @@ bool blueLessThan(const QRgb &c1, const QRgb &c2)
//median cut algoritmh
void ImageUtil::quantization(const QImage &img, QVector &palette)
{
- int bits = 4; // bits/pixel
+ int bits = 8; // bits/pixel
int samplesize = 100000; //only take this many color samples
rstime::RsScopeTimer st("Quantization");
From c85040e77eed701b628215dc2059d4795833df86 Mon Sep 17 00:00:00 2001
From: Benjamin Wright
Date: Thu, 5 Sep 2019 09:17:21 -0400
Subject: [PATCH 2/3] fixed typo strenghten => strengthen across all locations
---
retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 2 +-
retroshare-gui/src/lang/retroshare_af.ts | 2 +-
retroshare-gui/src/lang/retroshare_ar.ts | 2 +-
retroshare-gui/src/lang/retroshare_bg.ts | 2 +-
retroshare-gui/src/lang/retroshare_ca_ES.ts | 2 +-
retroshare-gui/src/lang/retroshare_cs.ts | 2 +-
retroshare-gui/src/lang/retroshare_cy.ts | 2 +-
retroshare-gui/src/lang/retroshare_da.ts | 2 +-
retroshare-gui/src/lang/retroshare_de.ts | 2 +-
retroshare-gui/src/lang/retroshare_el.ts | 2 +-
retroshare-gui/src/lang/retroshare_en.ts | 2 +-
retroshare-gui/src/lang/retroshare_es.ts | 2 +-
retroshare-gui/src/lang/retroshare_fi.ts | 2 +-
retroshare-gui/src/lang/retroshare_fr.ts | 2 +-
retroshare-gui/src/lang/retroshare_hu.ts | 2 +-
retroshare-gui/src/lang/retroshare_it.ts | 2 +-
retroshare-gui/src/lang/retroshare_ja_JP.ts | 2 +-
retroshare-gui/src/lang/retroshare_ko.ts | 2 +-
retroshare-gui/src/lang/retroshare_nl.ts | 2 +-
retroshare-gui/src/lang/retroshare_pl.ts | 2 +-
retroshare-gui/src/lang/retroshare_pt.ts | 2 +-
retroshare-gui/src/lang/retroshare_ru.ts | 2 +-
retroshare-gui/src/lang/retroshare_sl.ts | 2 +-
retroshare-gui/src/lang/retroshare_sr.ts | 2 +-
retroshare-gui/src/lang/retroshare_sv.ts | 2 +-
retroshare-gui/src/lang/retroshare_tr.ts | 2 +-
retroshare-gui/src/lang/retroshare_zh_CN.ts | 2 +-
retroshare-gui/src/lang/retroshare_zh_TW.ts | 2 +-
28 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 843d964ef..4013ad3d3 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -247,7 +247,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination.
\
Distant messages stay into your Outbox until an acknowledgement of receipt has been received.
\
Generally, you may use messages to recommend files to your friends by pasting file links, \
- or recommend friend nodes to other friend nodes, in order to strenghten your network, or send feedback \
+ or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback \
to a channel's owner.
\
").arg(QString::number(2*S)).arg(QString::number(S)) ;
diff --git a/retroshare-gui/src/lang/retroshare_af.ts b/retroshare-gui/src/lang/retroshare_af.ts
index b2d842ff8..9916af0bb 100644
--- a/retroshare-gui/src/lang/retroshare_af.ts
+++ b/retroshare-gui/src/lang/retroshare_af.ts
@@ -12883,7 +12883,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_ar.ts b/retroshare-gui/src/lang/retroshare_ar.ts
index 01753acbc..f78cda385 100644
--- a/retroshare-gui/src/lang/retroshare_ar.ts
+++ b/retroshare-gui/src/lang/retroshare_ar.ts
@@ -12884,7 +12884,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_bg.ts b/retroshare-gui/src/lang/retroshare_bg.ts
index ab9f8a9bb..d9ef5a76c 100644
--- a/retroshare-gui/src/lang/retroshare_bg.ts
+++ b/retroshare-gui/src/lang/retroshare_bg.ts
@@ -12883,7 +12883,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_ca_ES.ts b/retroshare-gui/src/lang/retroshare_ca_ES.ts
index b51d86ffc..47e6876b3 100644
--- a/retroshare-gui/src/lang/retroshare_ca_ES.ts
+++ b/retroshare-gui/src/lang/retroshare_ca_ES.ts
@@ -13055,7 +13055,7 @@ Voleu desar el missatge?
-
+
<h1><img width="32" src=":/images/help_64.png"> Missatges</h1> <p>Retroshare té el seu propi sistema de correu electrònic. Pots enviar/rebre correus de/a els nodes dels teus amics.</p> <p>També és possible enviar missatges a identitats d'altra gent utilitzant el sistema de encaminament global. Aquests missatges són sempre encriptats i reenviats per nodes intermediaris fins que arriben al seu destí. </p> <p>Els missatges distants es queden a la teva bustia de sortints fins que no es rep confirmació d'entrega.</p> <p>Generalment s'envien missatges per recomanar arxius a amics enviant els enllaços, recomanar nodes d'amics a altres amics, per millorar la teva xarxa, o respostes a propietaris de canals.</p>
diff --git a/retroshare-gui/src/lang/retroshare_cs.ts b/retroshare-gui/src/lang/retroshare_cs.ts
index b8a70634b..0e13d60c5 100644
--- a/retroshare-gui/src/lang/retroshare_cs.ts
+++ b/retroshare-gui/src/lang/retroshare_cs.ts
@@ -12936,7 +12936,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_cy.ts b/retroshare-gui/src/lang/retroshare_cy.ts
index 6839bd4e2..86197ebe1 100644
--- a/retroshare-gui/src/lang/retroshare_cy.ts
+++ b/retroshare-gui/src/lang/retroshare_cy.ts
@@ -12883,7 +12883,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_da.ts b/retroshare-gui/src/lang/retroshare_da.ts
index 4cebf24a7..2c342cec8 100644
--- a/retroshare-gui/src/lang/retroshare_da.ts
+++ b/retroshare-gui/src/lang/retroshare_da.ts
@@ -12883,7 +12883,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts
index 0eba9437d..300e58ad1 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -12942,7 +12942,7 @@ Möchtest du die Nachricht speichern ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_el.ts b/retroshare-gui/src/lang/retroshare_el.ts
index 7d948d741..d3874ba06 100644
--- a/retroshare-gui/src/lang/retroshare_el.ts
+++ b/retroshare-gui/src/lang/retroshare_el.ts
@@ -12934,7 +12934,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts
index c0f9d31e1..e7d8d68c1 100644
--- a/retroshare-gui/src/lang/retroshare_en.ts
+++ b/retroshare-gui/src/lang/retroshare_en.ts
@@ -12885,7 +12885,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_es.ts b/retroshare-gui/src/lang/retroshare_es.ts
index 8ce2a5f65..43216c650 100644
--- a/retroshare-gui/src/lang/retroshare_es.ts
+++ b/retroshare-gui/src/lang/retroshare_es.ts
@@ -13051,7 +13051,7 @@ Do you want to save message ?
-
+
<h1><img width="%1" src=":/icons/help_64.png"> Messages</h1> <p>RetroShare tiene su propio sistema interno de correo electrónico. Puede recibir/enviar correos de/a nodos amigos conectados.</p> <p>También es posible enviar mensajes a las identidades de otras personas usando el sistema de enrutamiento global. Estos mensajes siempre se cifran y firman, y son repetidos por nodos intermedios hasta que alcanzan su destino final. </p> <p>Los mensajes distantes permanecen en su Bandeja de Salida hasta que llegue un acuse de recibo.</p> <p>Generalmente, puede usar mensajes para recomendar archivos a sus amigos pegando los enlaces de los archivos, o puede recomendar nodos amigos a otros nodos amigos para fortalecer su red, o enviar comentarios al propietario de un canal.</p>
diff --git a/retroshare-gui/src/lang/retroshare_fi.ts b/retroshare-gui/src/lang/retroshare_fi.ts
index 0881ffeff..304490351 100644
--- a/retroshare-gui/src/lang/retroshare_fi.ts
+++ b/retroshare-gui/src/lang/retroshare_fi.ts
@@ -13059,7 +13059,7 @@ Haluatko tallentaa viestin?
-
+
<h1><img width="%1" src=":/icons/help_64.png"> Viestit</h1> <p>Retrosharella on sen oma sisäinen sähköpostijärjestelmä. Voit lähettää/vastaanottaa sähköposteja yhdistetyiltä ystäväsolmuilta.</p> <p>On myös mahdollista lähettää viestejä muiden ihmisten henkilöllisyyksiin käyttäen yleisreititinjärjestelmää. Nämä viestit ovat aina salattuja ja allekirjoitettuja, ja ne välitetään välissä olevien solmujen kautta, kunnes ne saavuttavat lopullisen kohteensa. </p> <p>Etäiset viestit säilyvät sinun Lähtevissä kunnes vastaanottotodistus on saatu.</p> <p>Yleisesti, sinä voit käyttää viestejä suositellaksesi tiedostoja ystävillesi liittäen tiedostolinkkejä, tai suosittelemalla ystäväsolmuja muille ystäväsolmuille, täten vahvistaaksesi omaa verkkoasi, tai antaaksesi palautetta kanavan omistajalle.</p>
diff --git a/retroshare-gui/src/lang/retroshare_fr.ts b/retroshare-gui/src/lang/retroshare_fr.ts
index fbdf59c40..9a1d06adb 100644
--- a/retroshare-gui/src/lang/retroshare_fr.ts
+++ b/retroshare-gui/src/lang/retroshare_fr.ts
@@ -13078,7 +13078,7 @@ Voulez-vous enregistrer votre message ?
-
+
<h1><img width="%1" src=":/icons/help_64.png"> Messages</h1> <p>Retroshare a son propre système de messagerie interne. Vous pouvez en envoyer/recevoir vers/depuis les noeuds de vos amis connectés.</p> <p>Il est aussi possible d'envoyer des messages vers les Identités d'autres personnes en utilisant le système de routage global. Ces messages sont toujours chiffrés et sont relayés par des noeuds intermédiaires jusqu'à ce qu'ils atteignent leur destination finale. </p> <p>Les messages distants restent dans votre boite d'envoi jusqu'à ce qu'un accusé de réception soit reçu.</p> <p>De façon générale, vous pouvez utiliser les messages afin de recommander des fichiers à vos amis en y collant des liens de fichiers, ou recommander des noeuds amis à d'autres noeuds amis, afin de renforcer votre réseau, ou envoyer du retour d'information (feedback) au propriétaire d'une chaîne.</p>
diff --git a/retroshare-gui/src/lang/retroshare_hu.ts b/retroshare-gui/src/lang/retroshare_hu.ts
index 3bd521859..1847c98a3 100644
--- a/retroshare-gui/src/lang/retroshare_hu.ts
+++ b/retroshare-gui/src/lang/retroshare_hu.ts
@@ -12983,7 +12983,7 @@ Szeretnéd menteni az üzenetet?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_it.ts b/retroshare-gui/src/lang/retroshare_it.ts
index 5e169c33d..a79f4cbd2 100644
--- a/retroshare-gui/src/lang/retroshare_it.ts
+++ b/retroshare-gui/src/lang/retroshare_it.ts
@@ -12950,7 +12950,7 @@ ricerca
-
+
<h1><img width="%1" src=":/icons/help_64.png"> Messaggi</h1> <p>RetroShare ha un suo sistema postale email interno. Puoi inviare/ricevere email a/da nodi amici a cui sei connesso.</p> <p>È altresì possibile inviare messaggi alle Identità altrui utilizzando il sistema di instradazione globale. Questi messaggi sono sempre crittografati e firmati, e vengono reinstradati da nodi intermedi finché non raggiungono la destinazione finale.</p> <p>I messaggi a distanza rimangono nella tua Casella in Uscita fin quando non ricevono una ricevuta di confermata consegna.</p> <p>Generalmente, puoi utilizzare i messaggi per raccomandare file ai tuoi amici, incollandovi i link ai file, o per raccomandare nodi amici ad altri nodi amici, al fine di irrobustire la tua rete, o per inviare un feedback al titolare di un canale.</p>
diff --git a/retroshare-gui/src/lang/retroshare_ja_JP.ts b/retroshare-gui/src/lang/retroshare_ja_JP.ts
index 677e55957..498c295e8 100644
--- a/retroshare-gui/src/lang/retroshare_ja_JP.ts
+++ b/retroshare-gui/src/lang/retroshare_ja_JP.ts
@@ -12884,7 +12884,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_ko.ts b/retroshare-gui/src/lang/retroshare_ko.ts
index cbdee4e48..5c178e506 100644
--- a/retroshare-gui/src/lang/retroshare_ko.ts
+++ b/retroshare-gui/src/lang/retroshare_ko.ts
@@ -12896,7 +12896,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_nl.ts b/retroshare-gui/src/lang/retroshare_nl.ts
index 8cf2dd432..be2d5dc77 100644
--- a/retroshare-gui/src/lang/retroshare_nl.ts
+++ b/retroshare-gui/src/lang/retroshare_nl.ts
@@ -12929,7 +12929,7 @@ Wil je het bericht bewaren?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_pl.ts b/retroshare-gui/src/lang/retroshare_pl.ts
index 408ab8c8f..37fb4a3c6 100644
--- a/retroshare-gui/src/lang/retroshare_pl.ts
+++ b/retroshare-gui/src/lang/retroshare_pl.ts
@@ -12901,7 +12901,7 @@ Czy chcesz zapisać wiadomość ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_pt.ts b/retroshare-gui/src/lang/retroshare_pt.ts
index 75387aaef..603068d21 100644
--- a/retroshare-gui/src/lang/retroshare_pt.ts
+++ b/retroshare-gui/src/lang/retroshare_pt.ts
@@ -12883,7 +12883,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_ru.ts b/retroshare-gui/src/lang/retroshare_ru.ts
index e278ecb96..c79252ebe 100644
--- a/retroshare-gui/src/lang/retroshare_ru.ts
+++ b/retroshare-gui/src/lang/retroshare_ru.ts
@@ -13056,7 +13056,7 @@ Do you want to save message ?
-
+
<h1><img width="%1" src=":/icons/help_64.png"> Сообщения</h1> <p>В RetroShare имеется собственный почтовый сервис. Вы можете отправлять/получать письма в пределах доверенного окружения.</p> <p>Благодаря глобальной системе маршрутизации данных, возможна рассылка писем другим участникам сети. Эти сообщения всегда подвергаются шифрованию и передаются адресату через промежуточные узлы сети. </p> <p>Для надёжной идентификации отправителя рекомендуется криптографически подписывать сообщения, используя the <img width="16" src=":/images/stock_signature_ok.png"/> кнопку в редакторе сообщений. Сообщения удалённым пользователям остаются в папке "Исходящие" до тех пор, пока не будет получено подтверждение в получении.</p> <p>Почтовый сервис RetroShare может быть использован для передачи ссылок на файлы или рекомендаций по включению в круг доверенных, что укрепит вашу сеть, а также для откликов на объявления в каналах.</p>
diff --git a/retroshare-gui/src/lang/retroshare_sl.ts b/retroshare-gui/src/lang/retroshare_sl.ts
index a246577cc..32f4e6c9b 100644
--- a/retroshare-gui/src/lang/retroshare_sl.ts
+++ b/retroshare-gui/src/lang/retroshare_sl.ts
@@ -12883,7 +12883,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_sr.ts b/retroshare-gui/src/lang/retroshare_sr.ts
index 89adfd28d..2f7bba286 100644
--- a/retroshare-gui/src/lang/retroshare_sr.ts
+++ b/retroshare-gui/src/lang/retroshare_sr.ts
@@ -12884,7 +12884,7 @@ Do you want to save message ?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_sv.ts b/retroshare-gui/src/lang/retroshare_sv.ts
index 9509dee3f..9d52d8320 100644
--- a/retroshare-gui/src/lang/retroshare_sv.ts
+++ b/retroshare-gui/src/lang/retroshare_sv.ts
@@ -12930,7 +12930,7 @@ Vill du spara meddelandet?
-
+
diff --git a/retroshare-gui/src/lang/retroshare_tr.ts b/retroshare-gui/src/lang/retroshare_tr.ts
index 1bcdc7444..005b00eae 100644
--- a/retroshare-gui/src/lang/retroshare_tr.ts
+++ b/retroshare-gui/src/lang/retroshare_tr.ts
@@ -13045,7 +13045,7 @@ Do you want to save message ?
-
+
<h1><img width="%1" src=":/icons/help_64.png"> İletiler</h1> <p>RetroShare kendi iç posta sistemine sahiptir. Bağlantılı arkadaş düğümleri ile e-posta alışverişi yapılabilir.</p> <p>Genel yöneltme sistemini kullanarak diğer kişilerin kimliklerine de ileti gönderilebilir. Bu iletiler her zaman şifrelenip imzalanır ve hedefe ulaşmadan önce ara düğümlerden geçirilir. </p> <p>Onay alındısı gelene kadar uzak iletiler Giden kutusunda kalır.</p> <p>Genel olarak iletiler arkadaşlarınızla dosya bağlantılarını paylaşmak, ağınızı güçlendirmek için arkadaş düğümlerini başka arkadaş düğümlerine önermek ya da bir kanal sahibine geri bildirim göndermek için kullanılabilir.</p>
diff --git a/retroshare-gui/src/lang/retroshare_zh_CN.ts b/retroshare-gui/src/lang/retroshare_zh_CN.ts
index 81bd72094..de02016ec 100644
--- a/retroshare-gui/src/lang/retroshare_zh_CN.ts
+++ b/retroshare-gui/src/lang/retroshare_zh_CN.ts
@@ -13031,7 +13031,7 @@ Do you want to save message ?
-
+
<h1><img width="%1" src=":/icons/help_64.png"> 邮件</h1> <p> RetroShare 有自己的内部邮件系统。你可以通过连接的好友节点发送/接收电子邮件。</p> <p>也可以使用全球路由系统向其他人的身份发送消息。 这些消息始终被加密和签名,并由中间节点中继,直到它们到达其最终目的地。 </p> <p>远程消息保留在发件箱中,直到收到确认。</p> <p>通常,你可以使用邮件通过粘贴文件链接向好友推荐文件,或者将好友节点推荐给其他的好友节点,来加强你的网络,或向频道所有者发送反馈。</p>
diff --git a/retroshare-gui/src/lang/retroshare_zh_TW.ts b/retroshare-gui/src/lang/retroshare_zh_TW.ts
index f41660bcc..7c79bcae6 100644
--- a/retroshare-gui/src/lang/retroshare_zh_TW.ts
+++ b/retroshare-gui/src/lang/retroshare_zh_TW.ts
@@ -12883,7 +12883,7 @@ Do you want to save message ?
-
+
From 398c943f4090b6d6f95611f04f944fcb7e0acd81 Mon Sep 17 00:00:00 2001
From: csoler
Date: Sun, 6 Oct 2019 00:12:28 +0200
Subject: [PATCH 3/3] fixed bug causing crash when forum being displayed is
deleted
---
retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
index 38495f204..c032e87ad 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
@@ -744,7 +744,7 @@ void RsGxsForumModel::update_posts(const RsGxsGroupId& group_id)
forumIds.push_back(group_id);
- if(!rsGxsForums->getForumsInfo(forumIds,groups))
+ if(!rsGxsForums->getForumsInfo(forumIds,groups) || groups.size() != 1)
{
std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve forum group info for forum " << group_id << std::endl;
return;