Merge branch 'hotfix/2.2.10b'

EDCD · Jan 23, 2017 · 99c0bfc · 99c0bfc
2 parents fcf0494 + 37bfc70
commit 99c0bfc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/app/components/Modification.jsx b/src/app/components/Modification.jsx
@@ -82,7 +82,7 @@ export default class Modification extends TranslatedComponent {
     return (
       <div className={'cb'} key={name}>
         <div className={'cb'}>{translate(name)}{symbol}</div>
-        <NumberEditor className={'cb'} style={{ width: '90%', textAlign: 'center' }} step={0.01} stepModifier={1} decimals={2} value={m.getModValue(name) / 100 || 0} onValueChange={this._updateValue.bind(this)} />
+        <NumberEditor className={'cb'} style={{ width: '90%', textAlign: 'center' }} step={0.01} stepModifier={1} decimals={2} value={this.state.value} onValueChange={this._updateValue.bind(this)} />
       </div>
     );
   }

diff --git a/src/app/components/ModificationsMenu.jsx b/src/app/components/ModificationsMenu.jsx
@@ -74,7 +74,8 @@ export default class ModificationsMenu extends TranslatedComponent {
     let modifications = [];
     for (const modName of Modifications.modules[m.grp].modifications) {
       if (Modifications.modifications[modName].type === 'percentage' || Modifications.modifications[modName].type === 'numeric') {
-        modifications.push(<Modification key={ modName } ship={ ship } m={ m } name={ modName } value={ m.getModValue(modName) / 100 || 0 } onChange={ onChange }/>);
+        const key = modName + (m.getModValue(modName) / 100 || 0);
+        modifications.push(<Modification key={ key } ship={ ship } m={ m } name={ modName } value={ m.getModValue(modName) / 100 || 0 } onChange={ onChange }/>);
       }
     }
     return modifications;